diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-09-09 15:58:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-09 15:58:47 +0000 |
| commit | 8cae9895c72701108d2f8302cb43ee9858f9efb6 (patch) | |
| tree | 8577de01f46f669e0d539de6f73547cd679c2c67 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | cb6d6629b8f362387c6e35683a2655b2455b72a4 (diff) | |
| parent | 423419525a66eccaa604d0307c3315ab661fc6d3 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 8ec83bfa97 -s ours am: 423419525a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15751105
Change-Id: I5d29b3ef033617ef7b7de89128b21bf5679b1c23
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions