From: Jean-Baptiste Queru <jbq@google.com>
Date: Tue, 6 Apr 2010 23:36:09 +0000 (-0700)
Subject: merge from kraken
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/b5f507814a4139e836c6166f5d0f755889cff1ea?ds=inline

merge from kraken

Change-Id: I63b85281bbd21d42a3e703f799c6941cd81614d0
---

b5f507814a4139e836c6166f5d0f755889cff1ea