]> git.saurik.com Git - android/aapt.git/commit
am afbf8afa: Merge change I564b5b00 into eclair-mr2
authorDoug Zongker <dougz@android.com>
Tue, 13 Oct 2009 20:47:54 +0000 (13:47 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 Oct 2009 20:47:54 +0000 (13:47 -0700)
commitb1387bdd1804412a7b3e2e81c41885153fc63634
tree33cfece262322849b567942457f533b07efc596f
parentaab37818172295d4b1ea806d54e5ea7e1e8ea7d9
parent1e8883fc0bafad2989f190c1a977d98ec9902962
am afbf8afa: Merge change I564b5b00 into eclair-mr2

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

* commit 'afbf8afa858a78b66c19f11cfda030e913b34085':
  add "junk path" -k option to aapt
Command.cpp