From: Dianne Hackborn <hackbod@google.com>
Date: Fri, 20 May 2011 04:44:52 +0000 (-0700)
Subject: resolved conflicts for merge of 06a8ceac to master
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/c8e46fb04e626b26511095db9e6b4fe68eb74b35?ds=inline;hp=--cc

resolved conflicts for merge of 06a8ceac to master

Change-Id: Id51574c825affddfac14ad7214c5496d6a3d6e69
---

c8e46fb04e626b26511095db9e6b4fe68eb74b35