From: Doug Zongker <dougz@android.com>
Date: Thu, 22 Oct 2009 05:34:14 +0000 (-0700)
Subject: am 0b3977f8: am 617262d8: (-s ours) Merge change I37c4157d into eclair
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/c20e2e1ca6008b94f0b9027a28eef0ef744e1947?ds=inline

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

Merge commit '0b3977f87b10fd78cffa0c39aaf787bfe6d108c7' into eclair-mr2-plus-aosp

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

c20e2e1ca6008b94f0b9027a28eef0ef744e1947