tree fe5d29c74882a1202dbba25f0e5db4fdab9e30bb
parent 0e39755cb35e6ede803847672a4a79f228d0d397
parent f28827d1e7c1de2fdc789e6b219203d4b7b1f1de
author TreeHugger Robot <treehugger-gerrit@google.com> 1634881420 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1634881420 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I5773367fd6e7e5b1fb8b2bed940ce927226f5c1f