tree ba40f6c8cce39095083b749ebe483c338281d787
parent 73047e3ed4e154eb9765962dccc02a8235c2a059
parent 7c3a3539f5f50f5612e7edbbc10b950fd956537c
author TreeHugger Robot <treehugger-gerrit@google.com> 1634132617 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1634132617 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I94678a11f0c5561d272686a788416189d9311961