tree fa9305c92a808a70aca22af0f2dc8b44274e2e43
parent 9d0657478b87dfb9a7b903c1f74123b036c3875a
parent 39bd3b0f40766deaa39c912ad2d3b316c7ab6614
author TreeHugger Robot <treehugger-gerrit@google.com> 1626874275 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1626874275 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 39bd3b0f40 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8c0cebc41af2170eef0105f2bd9b1a1f38416e8f