diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-22 20:09:24 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-22 20:09:24 +0000 |
commit | d0d8f77e5ce89b92ff765af2303f0d7eed83e2bb (patch) | |
tree | 46722e29358f6eb0eb8b41b870086e52cc440409 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | e908f88308d6e39a7418060e52a32edb257a716b (diff) | |
parent | 59464d6fa9677147ead5fad29af2408d9d8d8036 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 59464d6fa9 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684905
Change-Id: Iebf66a73b57236bae54223f653d0160e20790aac
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions