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-06-08 17:02:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-06-08 17:02:23 +0000
commit359f6a207988eb9617da284591bc3d4c9c6fac16 (patch)
treea84d7c38c16242c4f40ee0720eadc9be6695aaa2 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentd4cd9cb3c8bfb90938ff8792314c442d70488a8e (diff)
parent74ed3c2abb478fa639c9c7339398f390464a9fb5 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 4fd921518e -s ours am: aefb280258 -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