diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-22 21:45:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-22 21:45:43 +0000 |
| commit | 47d1352999f767ffd71043d58733955800d1699a (patch) | |
| tree | d63895f679e35a398374afc72208b4350afb9a60 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 5cfa84197d56ad4d299d3bebcb9a63bf4774d54a (diff) | |
| parent | 7a9d7c3b12b1f389bd5095d51205f08e6d68ce8d (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: f975580f62 -s ours am: 446ade3135 -s ours am: 7a9d7c3b12 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684936
Change-Id: I0b0b65cbc60175188a0762f8c371575d5bb619d1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions