From: Jean-Baptiste Queru <jbq@google.com>
Date: Tue, 1 May 2012 16:53:48 +0000 (-0700)
Subject: resolved conflicts for merge of bc2fb7b9 to jb-dev-plus-aosp
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/56918fa3750fca8d91eaa99d1d21f0cdca3dbc5e?hp=56918fa3750fca8d91eaa99d1d21f0cdca3dbc5e

resolved conflicts for merge of bc2fb7b9 to jb-dev-plus-aosp

Change-Id: I5386585e473201268c6ed8b05e0a16569d434ea2
---