From: Jean-Baptiste Queru <jbq@google.com>
Date: Thu, 2 Sep 2010 19:05:33 +0000 (-0700)
Subject: resolved conflicts for merge of bd6abed3 to gingerbread-plus-aosp
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/0317e70f19be4f19126432fc76b3ad4be99fdd95

resolved conflicts for merge of bd6abed3 to gingerbread-plus-aosp

Change-Id: I5522eaf85b157efede96399856fb67a1f244dd9d
---

0317e70f19be4f19126432fc76b3ad4be99fdd95