tree 2fa4a7c6fb13c850a87da99f8869ea147cd3c7f2
parent 7d3f0be8fdbd3193bc40dd1e1e89fce29cfaa17b
parent 6de4d94aa774d13c882ee8a0706d17d6e18e2ef5
author TreeHugger Robot <treehugger-gerrit@google.com> 1642277020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1642277020 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I00f5121b52cbe0748e472774f52803a25c2b6d96