tree 1f71d6ff931024bbae1467ff8c717167887fe15b
parent fcd7401cfdae451fea64911b134e4cbf0d3cc6e7
parent 262de4fb4f132ad77d3bf347547e1595aa91d831
author TreeHugger Robot <treehugger-gerrit@google.com> 1628626501 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628626501 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: Ic4f62ce35190b8d7e10de407d38f1bed1cd5e8d1