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-07-19 15:28:38 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-07-19 15:28:38 +0000
commit5cc7ee3f32345f4088025bfaa91b1545637a80dc (patch)
treefd5212ce314d91f45f8ffd5305800846e871e936 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentc1517c09d9ed3f67f9e9d003d2bb4ebc119916e6 (diff)
parent8d0d3a62a26598a44ca7401c00f1739b4b23c6ed (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: f6d4adeef4 -s ours am: 94ef8f65e4 -s ours am: 5accf14709 -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions