From: Doug Zongker <dougz@android.com>
Date: Tue, 20 Oct 2009 20:36:06 +0000 (-0700)
Subject: am 617262d8: Merge change I37c4157d into eclair
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/9469dae5aea99b5a8fff413d5e5cc8f0944df0f0

am 617262d8: Merge change I37c4157d into eclair

Merge commit '617262d8f57362536ddc00a070c1c0994741de44' into eclair-plus-aosp

* commit '617262d8f57362536ddc00a070c1c0994741de44':
  add "junk path" -k option to aapt (DO NOT MERGE)
---

9469dae5aea99b5a8fff413d5e5cc8f0944df0f0