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