summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-06-08 23:23:51 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-06-08 23:23:58 +0000
commit748604c1abe935f1139ada150f192803b64972c1 (patch)
treea4ed5d0b1b7d9efa0ffd33b4af247ccb006425d7 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent355ce9eb986c62ce596fc8830a2e5a347402d5f1 (diff)
parentf1e34e98f9c5653ebd06fd50e9c2a16cffcce414 (diff)
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 67a947b636 -s ours am: 95657195ca -s ours" into oc-dr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions