summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-31 16:37:11 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-05-31 16:37:11 +0000
commit83a1b9b36ca50594cd1cf6d8378cb9a56ed25870 (patch)
treea4fd606d4d3359218a32f2bd35f72edd4c95df3b /tools/aapt2/java/JavaClassGenerator_test.cpp
parent4d84dd333be429a036ff1f1815a04aba5365a00d (diff)
parent7a8b818e807511491f60af2f0f5c347e1594e8a9 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c5ad465cf3 -s ours am: 64051151b5 -s ours am: ff5fee19b3 -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions