| commit | 80fdc9624e6d53a78031bf99d34e7c01d53ad66e | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Apr 05 00:23:53 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Apr 05 00:24:40 2013 +0000 |
| tree | 13275587689b637d0238448698dc6d80802a5778 | |
| parent | 745a42bbb9db8d54af5381ef5fe41828bf6fc352 [diff] | |
| parent | 73f2d3c79e57cac58fa0499accb1fb1192b7103f [diff] |
Merge "Error on conflicting <uses-permission>" into jb-mr2-dev