Commits
Doug Zongker authored and Android Git Automerger committed 0246f20b413M
am a8dcf189: (-s ours) am 0b3977f8: am 617262d8: (-s ours) Merge change I37c4157d into eclair Merge commit 'a8dcf189bf280b1748ae61bc62ab4105cdf3657f' * commit 'a8dcf189bf280b1748ae61bc62ab4105cdf3657f': add "junk path" -k option to aapt (DO NOT MERGE)
Showing diff toa8dcf189bf2