From: Jean-Baptiste Queru <jbq@google.com>
Date: Tue, 1 May 2012 17:00:22 +0000 (-0700)
Subject: resolved conflicts for merge of 13c04786 to jb-dev-plus-aosp
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/49a9bf69364a9a501259785d47b9a4ac30e341eb?ds=inline;hp=--cc

resolved conflicts for merge of 13c04786 to jb-dev-plus-aosp

Change-Id: Ib7aa5a768f4606beb2a4387811cfed7c00cbc111
---

49a9bf69364a9a501259785d47b9a4ac30e341eb