From: Jean-Baptiste Queru <jbq@google.com>
Date: Sun, 15 Nov 2009 19:03:19 +0000 (-0800)
Subject: merge from open-source master
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/7bdb8736d24e0dddfa8eb3f530466057d484a470?hp=04f3dbd3b77006acd8e09b5c46f07d7f06f198ca

merge from open-source master
---