tree 13275587689b637d0238448698dc6d80802a5778
parent 745a42bbb9db8d54af5381ef5fe41828bf6fc352
parent 73f2d3c79e57cac58fa0499accb1fb1192b7103f
author Nick Kralevich <nnk@google.com> 1365121433 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1365121480 +0000

Merge "Error on conflicting <uses-permission>" into jb-mr2-dev