diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-12 21:53:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-12 21:53:40 +0000 |
| commit | fd0773cb29640563bffa2fb04322454439df016a (patch) | |
| tree | 745759914a49895be4880461b3f1164b5134a2c2 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 96ab6db65fcc45ad36affef85c598de08058e6d7 (diff) | |
| parent | 361353f28b0b12d913dcdb5d01d88643387d1211 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b4c4f6d65e -s ours am: 361353f28b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14162029
Change-Id: Ib7c8372249f5087c8ae469144b09ec7448958a5f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions