summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorSudheer Shanka <sudheersai@google.com>2016-07-12 19:42:38 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-12 19:42:38 +0000
commite8458d8f88316fdf873c4c04183192820a853313 (patch)
tree3a71c11552eac651f07b7a22440829150c3f5152 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent50904bedb575cd829c7712657f5761f8c192c0e4 (diff)
parent008d66e49c52b51bc2060a871163758ee1526f09 (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 Change-Id: I18ca4b24a2e18b122106027568cb92e3a10822ca
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions