tree 215701b535f767f591bcac63ff6e9345e86cc435
parent 9c6575d8c26eae7e5e1566b9acd9921486299629
parent df6dc40ac35c074cb0c4bb4441d6df833853ce3a
author Treehugger Robot <treehugger-gerrit@google.com> 1641865908 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1641865908 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5da82b96fd -s ours am: d2b6fe8cbf -s ours am: df6dc40ac3 -s ours

am skip reason: subject contains skip directive

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

Change-Id: If4fd0b4d65ef231976fe7a4f134e0d25baaa20aa