tree 5d34087236ff89637ac5a201ecaefcda11ecdc72
parent 902477724aec8268d73b1f3dbf257f2a2fe2d86b
parent 79b99b4cc7bd99ddf276ba1308bfa77fc9ecc31b
author TreeHugger Robot <treehugger-gerrit@google.com> 1618331227 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618331227 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 79b99b4cc7 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6235ca223d068ff9d4baf35cc7579a6145da29d1