From: Jean-Baptiste Queru <jbq@google.com>
Date: Fri, 11 Dec 2009 01:57:04 +0000 (-0800)
Subject: am a5a8cc13: resolved conflicts for merge of ce307f88 to eclair-mr2
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/6847fbceadc542f882adec4b3a04b760d204a179?ds=inline

am a5a8cc13: resolved conflicts for merge of ce307f88 to eclair-mr2

Merge commit 'a5a8cc13d3f906650a1eb17e20e1b26d68b78453' into eclair-mr2-plus-aosp

* commit 'a5a8cc13d3f906650a1eb17e20e1b26d68b78453':
  Add --custom-package to aapt
---

6847fbceadc542f882adec4b3a04b760d204a179