diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2016-07-12 20:20:09 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-12 20:20:09 +0000 |
| commit | 5396c6cd8553b95b852c045a27664bb02c13b890 (patch) | |
| tree | 65138e4d1c9bf05aca6389a248a6685468b7adbd /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | c994b7cc516369866afb731cd40877778278a318 (diff) | |
| parent | b47fa455e8bdee00f248af7e65291d5f0904003f (diff) | |
Merge \"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: 903fb640c6\" into nyc-mr1-dev-plus-aosp
am: b47fa455e8 -s ours
Change-Id: I25dd03825d129ec21d95ece658c3f6d238f04daa
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions