tree 4b5a5a287eafee37cfd5e2f8f779c72c4a141dc7
parent bd979ab2dd510736f521c9f5e19297096056a504
parent cd1feda701dfaed867732f60a3f1634a121fa3f4
author TreeHugger Robot <treehugger-gerrit@google.com> 1618349590 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618349590 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: If93d810c9e1648515913ec1b7c4e76bb6fe23153