diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-05 19:33:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-05 19:33:29 +0000 |
| commit | 756ef7c5e703fcfe7b9b58ee54667304330bc792 (patch) | |
| tree | 7652ac3d66acf9b55fe6815121dd2219e2c8716a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | deae5e78e0c54477af65e8bad26760bb28b3166c (diff) | |
| parent | 468874dd4fecf9107cbaa78162bad7ea71f2f79b (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 8136182dcd -s ours am: 468874dd4f -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519189
Change-Id: Ib0fe30436bd37d2785414103aa21268496a529e6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions