diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-01-02 08:44:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-02 08:44:17 +0000 |
| commit | 86e3bd8a07bdfacc887230f82d0caab76943275c (patch) | |
| tree | 67a919d4e86aedd38f002aabb2a2f1b3bddfbab5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 952d1314830bd2d8519159bddf42ae3121fc12de (diff) | |
| parent | e5a0ce6bcdf5918377a14c4d906d56b657e8ab49 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e4f60f7dff -s ours am: 1ad5c2f3c7 -s ours am: e5a0ce6bcd -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1539362
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idaf6a2a51837e0fcbb0d89643bfec3ec648421f7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions