From: Dianne Hackborn <hackbod@google.com>
Date: Tue, 14 Jun 2011 19:17:35 +0000 (-0700)
Subject: resolved conflicts for merge of 77fc8b80 to master
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/e71fb2dbf255fe1ba2791448a446aade4716329b?hp=d25ea7e18ee381dd2e4107200c4cb18355276f81

resolved conflicts for merge of 77fc8b80 to master

Change-Id: I014f9a886d6f05607d2a5d101ad2052a6841ee8d
---