summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-06-22 13:37:17 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-06-22 13:37:18 +0000
commitfa634f85f6af80196b361855d7ee8302b9d49531 (patch)
tree683753c3d1817d59049ec4ac7e90fbe6312f6fb5 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentd743c1beedc81ba51e3e3136328d724f211c1eb8 (diff)
parent340957a5e89aa8d7a54253303c398e5a8bf7cdd0 (diff)
Merge "Merge \\"Restrict hotspot qs tile to admin user\\" into nyc-dev am: ba568a46e6 am: 60075864d8" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions