tree 3c7f3e4ec7ea454819b5e087141a36cfbc6b436d
parent 2ea7d3a788fcda1fef07e6216414a2e1f4c3d333
parent 5a4e57d0ac1f6a0278df9c302d507b654d2ba9fa
author TreeHugger Robot <treehugger-gerrit@google.com> 1634132242 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1634132242 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I353acca24cdd094b9368b64f46d27d41168260b8