tree ac037279dfec81883c153b07c468bf8f925ae4ef
parent 95416fb89018d2ac8c57d8b5995d90c3ef996f4d
parent 2bdad70f49d4801b971e425e8a73607cecd8c180
author TreeHugger Robot <treehugger-gerrit@google.com> 1640288850 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1640288850 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 840efa7fde -s ours am: f9e4bc51b5 -s ours am: c55ca622de -s ours am: 2bdad70f49 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I59b2ce6930208470f3983c5f8b99207b8ce1ca1f