]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e8883f 5c71c5c)
am 617262d8: (-s ours) Merge change I37c4157d into eclair
authorDoug Zongker <dougz@android.com>
Thu, 22 Oct 2009 05:22:27 +0000 (22:22 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 22 Oct 2009 05:22:27 +0000 (22:22 -0700)
Merge commit '617262d8f57362536ddc00a070c1c0994741de44' into eclair-mr2

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


Trivial merge
mirror of aapt