tree a65ef3e33a1052079e6a7c4dd4ce0dddb986d226
parent ef8dca944353bb292a90e954eba62a01f7e73596
parent 7a48798a8bcdfafbf653750163d0ae163fb77ab0
author TreeHugger Robot <treehugger-gerrit@google.com> 1629249709 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629249709 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 7a48798a8b -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8a3e0d999db0603fa295149003b0444d22bf1c03