tree a9e0e5c34fc13bdb78058927ec24249545b8a06a
parent 7d56f363eeb75fc3c758c8ec634e4889199b6032
parent aa10b50587d25c959be5e8d03119bd19f77b5bc9
author TreeHugger Robot <treehugger-gerrit@google.com> 1592118408 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592118408 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 1e5e8ecad1 -s ours am: f7fa1d8d26 -s ours am: c794ff0044 -s ours am: aa10b50587 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11860338

Change-Id: I25f7f8117576f4e0a03a6f64601a986f4f89fb72