tree 8577de01f46f669e0d539de6f73547cd679c2c67
parent 4916b75a2449dfd144852b5481d828288f315cd0
parent 2a3e558f9ed2520717d4649ad161ac0815a03e35
author TreeHugger Robot <treehugger-gerrit@google.com> 1631203164 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1631203164 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 5055933564 -s ours am: 2a3e558f9e -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ibe69db34887cb7ec9d86cfa0d56dab0f3bc29dbd