summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-05-20 13:18:25 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-05-20 13:18:25 +0000
commita27bce87d450c18ede9bef0200b28ff3b3a1ed46 (patch)
tree8525d4bdcceccb8e5343beca8a96d7d133ea6c02 /tools/aapt2/java/JavaClassGenerator_test.cpp
parente7c88b78b86964ee9a4a74afb1d9c1125e5e7a6e (diff)
parent2fc8bfbdbaace4bc5316edc3669b76de5aab3824 (diff)
Merge "[automerger skipped] Import translations. DO NOT MERGE am: d1ab5aced6 -s ours am: 162dbaa3e4 -s ours am: 166bb0b15e -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions