From: Dianne Hackborn <hackbod@google.com>
Date: Tue, 24 May 2011 18:27:11 +0000 (-0700)
Subject: resolved conflicts for merge of bbca8133 to master
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/715618afe423f0b4234e82df4c8a6f572f6b086e?hp=3b663f23c9c168a06b534802d8f5e4d28589b8ab

resolved conflicts for merge of bbca8133 to master

Change-Id: I81493674dceab848e41d380a77a37e5a9be06db6
---