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