From: Dianne Hackborn <hackbod@google.com>
Date: Fri, 10 Jun 2011 19:45:36 +0000 (-0700)
Subject: resolved conflicts for merge of f51ded0f to master
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/4bb7d19e69b48f04813297e299e48c8a33833172?hp=-c

resolved conflicts for merge of f51ded0f to master

Change-Id: Ida356524a68aeb2b9b0013dfbb6ab4bd11e616e2
---

4bb7d19e69b48f04813297e299e48c8a33833172