Commits
Nick Kralevich authored and Android Git Automerger committed 1fdaace1b17M
am 80fdc962: Merge "Error on conflicting <uses-permission>" into jb-mr2-dev * commit '80fdc9624e6d53a78031bf99d34e7c01d53ad66e': Error on conflicting <uses-permission>
Showing diff toecc5b436357