diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-11-18 02:00:28 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-11-18 02:00:28 +0000 |
commit | ea5066795ada1b8d2c584822ae693724eb886fef (patch) | |
tree | edd3ef960249eeff10bcedf257321cc77acfb3b4 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 6be21930eabf0be7d5ab5cf478d136b6c8cc38dd (diff) | |
parent | 7184ee463b4009953137cd8a9a016668f07ddfff (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: fa8f158180 -s ours am: 7184ee463b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16230908
Change-Id: I37828f993bf9f1e51c2e79a8c2e1d28a55990c7e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions