tree 16ded1a9bc671c816e0ea2a1acb23fadb0b632e2
parent 0a229465fe9480d4d8d74c4d6553e486f02af685
parent 644f937c5788052d9c8a7f77519aa2fb5b3f903f
author TreeHugger Robot <treehugger-gerrit@google.com> 1637047651 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1637047651 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 22b77795b1 -s ours am: faaf3e29ac -s ours am: 644f937c57 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I9c3e795f7415deb7c114d8bfed479debe5f65245