tree b374dcaf7c362eb9656458af51784135e684a757
parent f18cc12af9dce16e1fb9592457e377df0bf3df15
parent 095c6a78692542d4777c7ac4feb83c11f5d49bfc
author TreeHugger Robot <treehugger-gerrit@google.com> 1629504259 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629504259 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I8f5100a026d04856552256e2a55ccd4dec3111ac