diff options
author | Sudheer Shanka <sudheersai@google.com> | 2016-07-12 20:06:51 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-07-12 20:06:51 +0000 |
commit | 2e84585c4dde87aa311faef5c0463006ee0c5280 (patch) | |
tree | edc24b665db7cf5c40140c352fa6f44e86fe3d0d /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 22769242191fba6700b2c6cd4bc60033398de3a0 (diff) | |
parent | 8fed0636c8f5db2c04da7230a63f0ac5be92e207 (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 am: 5441a248f4
am: 8fed0636c8
Change-Id: I79ef5d60a2357ad717cce1cb0e717a06dc785c52
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions