tree c3127e58eb7c7df720006f8f6baf8a672c2bf6f0
parent 59f00f794e94d82b967677b16b74068b145b7927
parent 76fee3eb7e9093b47fc2c9bfbd8837b964a50bfa
author TreeHugger Robot <treehugger-gerrit@google.com> 1617208967 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1617208967 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I22a41cb38907b8858008fdfc870d27e77ce03344