diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-09 22:42:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-09 22:42:40 +0000 |
| commit | dd0f13d85a9f2f8a24cde23865fd56694c066efc (patch) | |
| tree | f51ac24f964662dd395bddc409f40bc08e909b79 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | a1beb29ac30deeb9a00788ea60dc283a79444047 (diff) | |
| parent | c710b22dda90ce3c08f7cac1cd59f353518385ea (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f777237523 -s ours am: c710b22dda -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14143908
Change-Id: I81e602b67c7ce3b640b60c08b20e9e3c8b321914
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions