summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-05-26 00:23:59 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-05-26 00:24:01 +0000
commit36a1b38e899687b217fe6e043022ed83fc37386b (patch)
tree5fb577336cf04d8c4e71589c99be12e6753d9ba6 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentdac0708ea0efab696cd772ab346becbcc03232e6 (diff)
parentdbda4c2f9a6d2856c7665c6db3aaf61baee5b54d (diff)
Merge "Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22 am: 600d4f61ca am: c69aa838a8 am: 38a37f336f -s ours" into nyc-dev
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions