diff options
author | Sudheer Shanka <sudheersai@google.com> | 2016-07-12 19:52:44 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-07-12 19:52:44 +0000 |
commit | 5441a248f438e549b547d801dd3c0aa74860821b (patch) | |
tree | 328cf6443b1dd44aa096f8949768c97468a2a023 /tools/aapt2/java/JavaClassGenerator.h | |
parent | 4c8d924d4ca0227d5de96e59f3a7e8ede82979e3 (diff) | |
parent | 1bb51deaf484c272e42b2e060d7404b632d06e67 (diff) |
Merge \\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\" into lmp-mr1-dev am: f1d9152f9f am: 177422c91e am: fd0757f195 -s ours am: 7975dd5b48 am: 008d66e49c am: e8458d8f88
am: 1bb51deaf4 -s ours
Change-Id: I82e3b82dd260fef67e4c17156d9a868771e70e61
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.h')
0 files changed, 0 insertions, 0 deletions