From: The Android Open Source Project <initial-contribution@android.com>
Date: Fri, 20 May 2011 21:33:24 +0000 (-0700)
Subject: Reconcile with honeycomb-release
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/03de9b7f4db2b8dac61f0154a9600c0371c000d3

Reconcile with honeycomb-release

Change-Id: I83818e0c61f0fcb53b154cd0a85f18924745912f
---

03de9b7f4db2b8dac61f0154a9600c0371c000d3