tree 8da537d1db5177e39ac9e52b6392b391d6b59229
parent 97d5ea4b35b5011eefad534824537a4ed13761d5
parent af253df862939435ccddafabf8588c9179423603
author TreeHugger Robot <treehugger-gerrit@google.com> 1613241230 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613241230 +0000

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

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id4478a76160c7bf849c3e9bdff770cb0dbfa3cbf