diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-12 06:40:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-12 06:40:24 +0000 |
| commit | b1858faaab228070bbe844f8eefaae48af551849 (patch) | |
| tree | b68d9d8abb15f933c549633519b56f7481650648 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e1c20248ec80f2839efdefee57ead0f778b4de0b (diff) | |
| parent | a53b070759d5b5694c07fddaf9ba5357fe862602 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 0084833d5e -s ours am: a53b070759 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14158286
Change-Id: I431759ff5c046fbc18270e8825c49de0b34e36e7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions