diff options
| author | Nick Kralevich <nnk@google.com> | 2013-04-05 00:23:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-05 00:24:40 +0000 |
| commit | 80fdc9624e6d53a78031bf99d34e7c01d53ad66e (patch) | |
| tree | 13275587689b637d0238448698dc6d80802a5778 /libs | |
| parent | 745a42bbb9db8d54af5381ef5fe41828bf6fc352 (diff) | |
| parent | 73f2d3c79e57cac58fa0499accb1fb1192b7103f (diff) | |
| download | frameworks_base-80fdc9624e6d53a78031bf99d34e7c01d53ad66e.zip frameworks_base-80fdc9624e6d53a78031bf99d34e7c01d53ad66e.tar.gz frameworks_base-80fdc9624e6d53a78031bf99d34e7c01d53ad66e.tar.bz2 | |
Merge "Error on conflicting <uses-permission>" into jb-mr2-dev
Diffstat (limited to 'libs')
0 files changed, 0 insertions, 0 deletions