From: Kenny Root <kroot@google.com>
Date: Tue, 12 Apr 2011 17:27:15 +0000 (-0700)
Subject: resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aosp
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/838914df8530468f5ce5e011a7049a9c48c81e54

resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aosp

Change-Id: Ia1a0024aabf531438203eb9fea3a10dd15eabe53
---

838914df8530468f5ce5e011a7049a9c48c81e54