diff options
author | Sudheer Shanka <sudheersai@google.com> | 2016-06-21 22:46:23 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-21 22:46:23 +0000 |
commit | 5bf93280bf6aba5b9c4edcb32fee7db720fbd360 (patch) | |
tree | 4f2afee494520b322c9248650e3cb55b9fd3b95e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 56056bd6c9d7a3d3faa7ef70240dedf3b32daf5f (diff) | |
parent | b0de5fd328b04ba89b09915dd367014d6536dc02 (diff) |
Merge \\\\\"Add pm operation to set user restrictions.\\\\\" into mnc-dev am: 144b3a42cc am: f43aa2e837 am: 916728bb35 am: 4e8aa0f35f -s ours
am: b0de5fd328
Change-Id: I3a751b6cada4c412ce67f3e160936c10f129d07e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions