diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-28 05:51:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-28 05:51:56 +0000 |
| commit | cc0cd35766949d6b8a79ba443e5b27927d70c9ed (patch) | |
| tree | ee3804b43bb20a0cbbde63169c77ea906bab2448 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 128fc185abf01e02520b2db9b10828a0f2ccbf84 (diff) | |
| parent | 248ac4cd6ceffedf9a2a70ba06b84b25015d80e2 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: f8315ae79d -s ours am: 2b757435b9 -s ours am: 8ea05523fa -s ours am: 248ac4cd6c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12014870
Change-Id: I2f254c0e481d3e782d47fc6a5e4491a00012f42f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions