diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-23 18:29:19 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 18:29:19 +0000 |
commit | 837d97d17c7359a7647ca48e6d5845bdaa40614d (patch) | |
tree | 5c9a79eccf75bf4114202965af78e891dd5f0b00 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 994f2578bf6a0aa343ebf7a38685cbae81c9fa4a (diff) | |
parent | bb15668b5fb182ed503186e69a87c8dfd2fa9d72 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: dffcd5fe7a -s ours am: be8cba0fac -s ours am: bb15668b5f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11961575
Change-Id: I5fbc3be5b6d787216c94194d4d8303e1a75024bc
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions