tree 7a16c2a2b8fb2d68ffea464533551275e536eb58
parent 9ac3b7accb0e2b392c8ab648e085378b3ca536f3
parent 681902373f24a6fbc129d2a0cdb3b4d25e213b1b
author TreeHugger Robot <treehugger-gerrit@google.com> 1629497952 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629497952 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 681902373f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4e7e97f55751ce0120c1937a2c1c876ecf68620c