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