tree df01d4325c0f6201bea081377de83827181c4b89
parent a3baa739ab138fe013ae3dabda266cf4520bf0c4
parent 75d739ff27d30cc4b82aa003a9def7d649c083c1
author TreeHugger Robot <treehugger-gerrit@google.com> 1622530352 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1622530352 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I8a88f0af4607b01760981889c6fbdd84f8a8be6e