tree 8da537d1db5177e39ac9e52b6392b391d6b59229
parent 780c96016b97141c030d070fcfe8074032cd2afe
parent 48ba58238ad038b4d2d4fdbabdbfaf3ee1927068
author TreeHugger Robot <treehugger-gerrit@google.com> 1613241317 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613241317 +0000

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

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8bccbe574e38a4f643bf19d4524db3d64dc866ed