tree 5feffc0eba63cac9df8f0b9f58a268a88e526bf0
parent 95512519483edda6ee7b0c87c4d7f725bd5197be
parent 96d311eb3b92b230912686d4751eab1672b0a92c
author Bill Yi <byi@google.com> 1631453793 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1631453793 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 50a4da21bd -s ours am: a7e6ae396b -s ours am: 96d311eb3b -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia0f379ede578ba699f9c7d57250224417325d90a