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-08-21 23:05:03 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-08-21 23:05:03 +0000
commitf5612df16ee53504b1473166aaa4915a350f29bf (patch)
tree28634386a64fcc8f1ee6cc4efcfdef2139ec86b3 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent8b443faacad2fb537b860ce92bea224f4f6027c0 (diff)
parent79b813ab20407e3b466b00f97b5106842c86003d (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: fc30db1bd8 -s ours am: e8faa17604 -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions