]> git.saurik.com Git - android/aapt.git/commit
am 617262d8: Merge change I37c4157d into eclair
authorDoug Zongker <dougz@android.com>
Tue, 20 Oct 2009 20:36:06 +0000 (13:36 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 20 Oct 2009 20:36:06 +0000 (13:36 -0700)
commit9469dae5aea99b5a8fff413d5e5cc8f0944df0f0
tree33cfece262322849b567942457f533b07efc596f
parentaab37818172295d4b1ea806d54e5ea7e1e8ea7d9
parent5c71c5c30b3e71e70972b55ceda8f123d3b628de
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)
Command.cpp