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