tree 0200b512657cd9f1e143ad93ed023dc5dc01501e
parent c1892e83442e5e7c99c85633806cbdfd0835ca7d
parent fba69cad446ecc9f9447717a23d972db9b11cac3
author Treehugger Robot <treehugger-gerrit@google.com> 1603484645 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1603484645 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b7dc979577 -s ours am: fba69cad44 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I668a3b52ea71aa484a8a56f4835764a778398324