tree 241eaae636d79c10987647fb336332f7204b9862
parent 285d2cc40871fb68761f3fd797eac78eb8cfa76e
parent b05d7d92ecbe385b6a1717d7c532908b2878ca51
author TreeHugger Robot <treehugger-gerrit@google.com> 1642277941 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1642277941 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I6f18f7249962392074958896e0f1a82ea317dc49