tree 215701b535f767f591bcac63ff6e9345e86cc435
parent 942c1bb985c54688a63bff898519ee1fb3dfc35b
parent e49246e73beca1335af852dc6956a16a4d1e3fe5
author Treehugger Robot <treehugger-gerrit@google.com> 1641865582 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1641865582 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 61c868d07e -s ours am: 96088df10d -s ours am: e49246e73b -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ic50e24388224ccf282aa5acb432ee1b47f787cb1