Commits
Jean-Baptiste Queru authored and Android Git Automerger committed d54dda77071M
am 926d1a22: am a5a8cc13: resolved conflicts for merge of ce307f88 to eclair-mr2 Merge commit '926d1a22007d94ef2b29ec979ab6038fa8d9e40e' * commit '926d1a22007d94ef2b29ec979ab6038fa8d9e40e': Add --custom-package to aapt
Showing diff tof1ec19e0f3f