tree d58f8b2b8c72bf5dd8a956e665ee85e9ce983fd6
parent 644f937c5788052d9c8a7f77519aa2fb5b3f903f
parent 2f84cf5dc6633a76599b60a0ca487cf2845c9f64
author TreeHugger Robot <treehugger-gerrit@google.com> 1637047035 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1637047035 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 61d2cb4fce -s ours am: 2f84cf5dc6 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4867e83281af2970aa8c552455f2a6a868f8c81e