From: Raphael <raphael@google.com>
Date: Fri, 28 Oct 2011 22:27:22 +0000 (+0000)
Subject: am 48ba4139: (-s ours) am fe9a2a54: (-s ours) Cherry-pick f51125d from master to... 
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/d205df67d395fad69fc0d9b43399b0dd51daa14f?ds=sidebyside

am 48ba4139: (-s ours) am fe9a2a54: (-s ours) Cherry-pick f51125d from master to ics-mr0. do not merge.

* commit '48ba4139b9dc1f53f996b71f509a9d0c6fd2d72b':
  Cherry-pick f51125d from master to ics-mr0. do not merge.
---

d205df67d395fad69fc0d9b43399b0dd51daa14f