From: Jean-Baptiste Queru <jbq@google.com>
Date: Thu, 3 Sep 2009 22:18:14 +0000 (-0700)
Subject: merge from donut
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/811c16f33b5cbd60df68bf0d087c4fdfdaa87ceb?hp=--cc

merge from donut
---

811c16f33b5cbd60df68bf0d087c4fdfdaa87ceb