tree 7fc52d413a6309a0f22980979f2394e9c60f5d59
parent 9b05930054d3b871ffd52d9b3627c2c17ea029e7
parent 8b2f0230d54fc3227677710ecf4166493b66670a
author TreeHugger Robot <treehugger-gerrit@google.com> 1618858733 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618858733 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: If2a5221be90c3a65e6fdbf98851fbaee71d9569b