From: The Android Automerger <android-build@android.com>
Date: Tue, 12 Jun 2012 18:22:34 +0000 (-0700)
Subject: merge in jb-release history after reset to jb-dev
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/c1824872179c925f33918a408b17a0e1b2f4c415

merge in jb-release history after reset to jb-dev
---

c1824872179c925f33918a408b17a0e1b2f4c415