tree cdd89100b2497ed22545425acccd52d5c981d4f6
parent 854be1d16ae0ed3f35b51579247998a00cc81846
parent 4589b798fd3e14e91c486a1ddd983c78f3c8f76a
author TreeHugger Robot <treehugger-gerrit@google.com> 1632898053 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1632898053 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I46072261c7269d663ad5fb5d1e67820438277143