tree 474d585b30f03bd0db3c07ca2bb1ff49001c050b
parent 75f52fcee4995c3bdfd89d9baf0b986d9dde7c41
parent ef9a87af6007646160965cdcf697ce1747b9b65c
author TreeHugger Robot <treehugger-gerrit@google.com> 1628365183 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628365183 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d8da6e8ad0 -s ours am: ef9a87af60 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I419ee633d875422ef6b886cb8a40b2807f3ea42d