tree f6de7411df4e0b489e8d8ccbeb14c29fe73f996b
parent 3b2a620088064e260cfca578dcfe1bd684c93506
parent 5c8c5ac9f9deae352115fef0898e3ca4406d94a9
author TreeHugger Robot <treehugger-gerrit@google.com> 1642546222 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1642546222 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 319336eae8 -s ours am: 9a533b7e44 -s ours am: 5c8c5ac9f9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Icaf2c11e65a6021d72c014b8a5a15cb81f4a40b4