diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-22 19:19:02 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-22 19:19:02 +0000 |
commit | 550e92d020dc0ef4f2cdb225fd29dda99bd3e8bf (patch) | |
tree | ce7f4ef12224ad878f43cfe81858d66c70b2e5e6 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 741bd0cf462d1afeeb3c9c395cfa12f125f9b840 (diff) | |
parent | 199b0018ff954dd060bf1137e2d968691065bac4 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 199b0018ff -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684409
Change-Id: Icfdc3dbaa4d62abe20cb54e518db4f5ae1e8da91
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions