]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b1387bd 86ef11f)
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)
Merge commit '0b3977f87b10fd78cffa0c39aaf787bfe6d108c7' into eclair-mr2-plus-aosp

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


Trivial merge
mirror of aapt