tree ac037279dfec81883c153b07c468bf8f925ae4ef
parent b4a36320e9e36e6d38960da5d053b7fdf959a60a
parent 55a14542ba793631d3a272523c4d6e6cf0704bea
author TreeHugger Robot <treehugger-gerrit@google.com> 1640288122 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1640288122 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 8f3138a706 -s ours am: 725666a4e6 -s ours am: 55a14542ba -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5e329fe4f3db097d7f55d11eeb54086beea656ee