diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2016-07-12 19:47:49 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-12 19:47:49 +0000 |
| commit | cbe258aa2792ebf353f69bfd5770e678e51a7100 (patch) | |
| tree | 4da70ca7984b47189beaf5388233bc496aba649a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 1bb51deaf484c272e42b2e060d7404b632d06e67 (diff) | |
| parent | a730e5977e72562beac7cdeb062e1fc3bb84760e (diff) | |
Merge \\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\" into lmp-mr1-dev am: d327d73edf am: cb7e0643c9 am: 76c9d70756 -s ours am: 6ae7a5f72b am: 322e70cef3
am: a730e5977e
Change-Id: Ic3f93423fed99fe6e1b1142e9f949866897954ae
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions