From: Xavier Ducrohet <xav@android.com>
Date: Wed, 20 Jul 2011 23:31:25 +0000 (-0700)
Subject: resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/82cf0eaeddd1f87bf54db24d3f84856a679e53a4?ds=sidebyside;hp=--cc

resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp

Change-Id: I806c7b4ae95f66df621587e52497dd8739a115fe
---

82cf0eaeddd1f87bf54db24d3f84856a679e53a4