diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-23 15:25:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-23 15:25:19 +0000 |
| commit | b10e4e11bc8bbdd4bd8fdc74558f6249fc3cf872 (patch) | |
| tree | 1f57c8a027ed8a45501d83ced5832a0867bbaf2e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | d2a77dfb237aa7f233ca1c0ca4d97f93d982c9d3 (diff) | |
| parent | 87380ec0f8e08b26435d8a535240343a56cb7c75 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 8e2d3a4c0a -s ours am: 64035f6df8 -s ours am: 87380ec0f8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12431109
Change-Id: I73a55448ef99ffb625c9777c990628b75c5786c9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions