tree 1c9cb2ec3d045c8cc468ed837d84b8e46e661e08
parent aec13b2c6e0f7772b63a7e1cd859a029d51cdd6d
parent d7f47ec0e9f994c4fdbda08565830e17c96ec364
author Bill Yi <byi@google.com> 1628390747 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628390747 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 07d017a5a0 -s ours am: 046c6676dd -s ours am: 24e6fc2a39 -s ours am: d7f47ec0e9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8b0726c5630afdcd0489338cc1fcf6d78cff5756