From: Jean-Baptiste Queru <jbq@google.com>
Date: Tue, 6 Apr 2010 23:38:00 +0000 (-0700)
Subject: merge from kraken-plus-aosp
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/da542759ae8e53ff9d77e61d66f3056a97f7e66b

merge from kraken-plus-aosp

Change-Id: Ice8381ca0386c01253be0fa6f9f91b993cac500d
---

da542759ae8e53ff9d77e61d66f3056a97f7e66b