diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2016-07-12 19:52:48 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-12 19:52:48 +0000 |
| commit | 5b28589127afbd4eda622970f7c25bbf135db672 (patch) | |
| tree | 328cf6443b1dd44aa096f8949768c97468a2a023 /tools/aapt2/java/JavaClassGenerator.h | |
| parent | 5441a248f438e549b547d801dd3c0aa74860821b (diff) | |
| parent | cbe258aa2792ebf353f69bfd5770e678e51a7100 (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
am: cbe258aa27 -s ours
Change-Id: I1cd45ce38ea1859fef073124cd3362076b2c33e4
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.h')
0 files changed, 0 insertions, 0 deletions