From: Kenny Root <kroot@google.com>
Date: Tue, 12 Apr 2011 19:51:08 +0000 (-0700)
Subject: resolved conflicts for merge of 18490fb9 to master
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/a9115c86cf3440b2b6ee37f47da6f56bf5f859c6?hp=--cc

resolved conflicts for merge of 18490fb9 to master

Change-Id: I6c68e6fb0f9c1182a955689bbffc161a8f30bd37
---

a9115c86cf3440b2b6ee37f47da6f56bf5f859c6