tree c020888716c02a74aba896b2cd710b6abcf4db42
parent 25c03b6b3fac91ebc4d1f7994c45920653723871
parent 2139ac238925cb9e95e0934113106be27a095904
author Bill Yi <byi@google.com> 1628900410 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628900410 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I2a26b90c0a9c90db941fbc6ae3c807ca094b6b20