tree d842c3ac81d4a8d700f75629210591b06098e100
parent 5bed2424c284437068fef45c44f26a3675cad644
parent c6b0a354105ec9a1b20da02939da8683743d8517
author Bill Yi <byi@google.com> 1630269562 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1630269562 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I8a677c8ab561a273dcd72ee2e27f103d1463a7e2