From: Dianne Hackborn <hackbod@google.com>
Date: Thu, 2 Jun 2011 23:44:52 +0000 (-0700)
Subject: resolved conflicts for merge of 54cb63e2 to master
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/83c734a53b345465ecafa37c5c6d4cc180161d6f?ds=inline

resolved conflicts for merge of 54cb63e2 to master

Change-Id: I5b741a1781e3f76c03fc1534ffce871117effd10
---

83c734a53b345465ecafa37c5c6d4cc180161d6f