From: The Android Automerger <android-build@android.com>
Date: Tue, 24 Jul 2012 19:39:30 +0000 (-0700)
Subject: merge in jb-mr0-release history after reset to jb-dev
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/27a7003e05db84977396b65b441d757c3580aa3f

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

27a7003e05db84977396b65b441d757c3580aa3f