diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-21 08:38:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-21 08:38:45 +0000 |
| commit | 54bc37353fd38a21768a171627bf78f96d911543 (patch) | |
| tree | 58fbabf65039e97889bc8fb11492019a3e8a696f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 60d8e8a7eb0f9907b50a304b37447407eab97935 (diff) | |
| parent | 6c794475b210e291fb9bfa8c913e3483bb59eb9d (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8db9af6fb5 -s ours am: 6c794475b2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11937069
Change-Id: I6e41d7acd9c3ddcd05efbcc7d1408f42a1251400
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions