diff options
author | Sudheer Shanka <sudheersai@google.com> | 2016-07-12 20:12:46 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-07-12 20:12:46 +0000 |
commit | b1e44b13e74ee24ed0e9fcb87b2074c30e488b3d (patch) | |
tree | 65138e4d1c9bf05aca6389a248a6685468b7adbd /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | a728ccdaa55f0f1eda0e76d38c147f063dbd8b31 (diff) | |
parent | 2e84585c4dde87aa311faef5c0463006ee0c5280 (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
am: 2e84585c4d -s ours
Change-Id: I017dcb7f41f4c906fe709b7864e196843b94b9dc
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions