tree bca10b8394b5f59098ab08fd688d24f428e18116
parent 7b26300c42ccbe043ad2570bb39848aaf9ef7951
parent 345a4d331f1b1afd8b3fabb391df0c18b3f5347a
author TreeHugger Robot <treehugger-gerrit@google.com> 1594887614 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594887614 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 345a4d331f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I93c52f2842c936c70844c0623c83ee9505059306