tree bad30ec36b56663f55f4c40419745aabb87bfad0
parent f89703efa78d4039a1fa1bc0e339cbfb43f7e65b
parent 2f7e887a15d06b32461e5248269772f0653a8fb7
author Bill Yi <byi@google.com> 1631452647 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1631452647 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: c2a03f945e -s ours am: 73b407caba -s ours am: 2f7e887a15 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I176aca8a4018161a149f3b5134167d4da7c6c7e2