]> git.saurik.com Git - android/aapt.git/commit
am 0b3977f8: am 617262d8: (-s ours) Merge change I37c4157d into eclair
authorDoug Zongker <dougz@android.com>
Thu, 22 Oct 2009 05:34:14 +0000 (22:34 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 22 Oct 2009 05:34:14 +0000 (22:34 -0700)
commitc20e2e1ca6008b94f0b9027a28eef0ef744e1947
tree33cfece262322849b567942457f533b07efc596f
parentb1387bdd1804412a7b3e2e81c41885153fc63634
parent86ef11f14ec042a83c9f2cc43166472f9c414e1d
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)