From: android-build SharedAccount <android-build@google.com>
Date: Mon, 29 Nov 2010 17:22:05 +0000 (-0800)
Subject: manual merge due to conflicts
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/3c8a9401edb6b5e23e9f4d1c2a3c5e0239020b08

manual merge due to conflicts

Change-Id: Id3901c3969111ea43ffdbfeadcf33491bb1c1114
---

3c8a9401edb6b5e23e9f4d1c2a3c5e0239020b08