From: Dianne Hackborn <hackbod@google.com>
Date: Mon, 4 Oct 2010 21:54:59 +0000 (-0700)
Subject: resolved conflicts for merge of 10d5b096 to master
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/440fcf2cb765ff99ccc9ccbc1afb9de1a698e2bb

resolved conflicts for merge of 10d5b096 to master

Change-Id: Id5c6ba651f72b48f0d70ee2ca64a6c9adf5e74f7
---

440fcf2cb765ff99ccc9ccbc1afb9de1a698e2bb