tree 2913607620ac7dd33cf262906c36186c8f42b64e
parent 34e94a3591f91895d68440ae03039b40e2e92dc1
parent 011a7c7c1484db133a3dfc918e66921ec37b06dc
author TreeHugger Robot <treehugger-gerrit@google.com> 1645208556 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1645208556 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I468de72fa97120491497130e48adf68497562065