summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-05-05 12:18:26 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-05-05 12:18:33 +0000
commitacac2a75cfbcae9857252f7c5bffb6e97af1a0f8 (patch)
treea9a8757aeb06f9d755bc34354ceb2a4fa66405cd /tools/aapt2/java/JavaClassGenerator_test.cpp
parent9d06e809f7cad7ab243f3eb4efaa042bc7cba7dd (diff)
parent009a4f0191e5e93d3494c51d39e4590cabb3d75c (diff)
Merge "Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 8d95e04111 -s ours" into oc-dev-plus-aosp am: 84bb0ecd1d -s ours"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions