Commits
Doug Zongker authored and Android Git Automerger committed a8dcf189bf2M
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)
Showing diff tof25c9660922