From: Jean-Baptiste Queru <jbq@google.com>
Date: Sun, 15 Nov 2009 22:55:20 +0000 (-0800)
Subject: merge from open-source master
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/e9216e01ecf2e6786e8dc1e2ea66035470482f0e

merge from open-source master
---

e9216e01ecf2e6786e8dc1e2ea66035470482f0e