summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorSudheer Shanka <sudheersai@google.com>2016-07-12 20:01:04 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-12 20:01:04 +0000
commit903fb640c623b87b57989e369447106c621dec56 (patch)
tree3c1fac859c61720d624dcff777a02c972af51f0e /tools/aapt2/java/JavaClassGenerator.cpp
parent3750c9a15afd4b9a1a229ca106ccd6b60996d5c5 (diff)
parent5441a248f438e549b547d801dd3c0aa74860821b (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 Change-Id: Ib4f04849819432248e069997659215ecf2840e67
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions