From: The Android Open Source Project <initial-contribution@android.com>
Date: Tue, 19 Jun 2012 13:13:23 +0000 (-0700)
Subject: Reconcile with jb-release
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/180f1af5d8c7f1c1e80126ab59f8a5bc69bb51ca

Reconcile with jb-release

Change-Id: I451b63991c4550290f6e32f2f555f0412bf0b28c
---

180f1af5d8c7f1c1e80126ab59f8a5bc69bb51ca