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