summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-08-01 07:51:40 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-08-01 07:51:40 +0000
commit63cfdfc02e306e81df69bbe1239747c5cfa588f8 (patch)
tree9550537e69552e70548a02594e5aa8d58035dfe1 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent4dd0c0b4b66bff524b712240ae03950f4803287d (diff)
parente858e9b36d2817a55cbd50858544e3ba2f6b3ec8 (diff)
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 7eca0300b9 -s ours am: fb80235f41 -s ours" into oc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions