tree ce7f4ef12224ad878f43cfe81858d66c70b2e5e6
parent 741bd0cf462d1afeeb3c9c395cfa12f125f9b840
parent 199b0018ff954dd060bf1137e2d968691065bac4
author Treehugger Robot <treehugger-gerrit@google.com> 1619119142 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619119142 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: Icfdc3dbaa4d62abe20cb54e518db4f5ae1e8da91