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