From: Xavier Ducrohet <xav@android.com>
Date: Tue, 15 Jan 2013 22:24:56 +0000 (-0800)
Subject: resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-dev
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/faa8c413001bcdcb15188ab77b31584c944f2042?ds=sidebyside;hp=faa8c413001bcdcb15188ab77b31584c944f2042

resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-dev

Change-Id: I839981af97e54c39f0ea0b8141a4dd02959263a0
---