From: The Android Automerger <android-build@android.com>
Date: Thu, 9 Dec 2010 15:21:54 +0000 (-0800)
Subject: Merge branch 'master' into honeycomb-release
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/2cb0f6e073c305097694e7332906d80146b3a9ee

Merge branch 'master' into honeycomb-release
---

2cb0f6e073c305097694e7332906d80146b3a9ee