diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-21 08:37:46 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-21 08:37:46 +0000 |
commit | 7861bbb7e48ff51ac9c44324d00bc157dcff8b86 (patch) | |
tree | 15f70a0310f6cb97ddb5ca0c13dbea0b5d2b3626 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 678ad90f1e45796ff77c445f9b20183c23c43598 (diff) | |
parent | 96db3dad2a4a1c4f1622a2b268b347cda0e808db (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 96db3dad2a -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532303
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I345d74d2db57a0ab4c699b86835d491aceffaa8f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions