From: Doug Zongker <dougz@android.com>
Date: Thu, 22 Oct 2009 05:22:27 +0000 (-0700)
Subject: am 617262d8: (-s ours) Merge change I37c4157d into eclair
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/86ef11f14ec042a83c9f2cc43166472f9c414e1d

am 617262d8: (-s ours) Merge change I37c4157d into eclair

Merge commit '617262d8f57362536ddc00a070c1c0994741de44' into eclair-mr2

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

86ef11f14ec042a83c9f2cc43166472f9c414e1d