summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-07-26 08:20:16 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-07-26 08:20:16 +0000
commit8f148cdce4d1cc42ddd543a0c574490abcaf914c (patch)
tree096424997f422b24a2175f5cc25ab14e56a498d1 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent816a4d38de8105852e3e7ad80a0c08d4c140ace1 (diff)
parentd84d1080e5d854148c923513342bea4555d03eb5 (diff)
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: a7f60741ae -s ours am: 799144a18b -s ours" into oc-dr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions