tree 002c445b945c75c4bfedda40cbf4540052245720
parent 02b89fdc8edf44ad6ef1166fc08cebe7e15b5236
parent 095f89d7b1dda8dc5931b8160b1d945031c67f71
author TreeHugger Robot <treehugger-gerrit@google.com> 1629249004 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629249004 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 13fdf59374 -s ours am: e901fdc011 -s ours am: 73c6c430fc -s ours am: 364c31c0f5 -s ours am: 095f89d7b1 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ifff8934c6abe653e530491ce1a61050ae87c3d8c