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:13 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-06-22 13:37:14 +0000
commitd743c1beedc81ba51e3e3136328d724f211c1eb8 (patch)
tree683753c3d1817d59049ec4ac7e90fbe6312f6fb5 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent48ca6cba8af8700d5477b7835935b84363057f0b (diff)
parent21e0f33ed0fedbc6362dfcdfb78d17f0fd48e3f5 (diff)
Merge "Merge \\"Restrict hotspot qs tile to admin user\\" into nyc-dev am: ba568a46e6 am: 045fd29c75" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions