tree 269f2a01722fec69702c275fa690b5763d5c6333
parent 468874dd4fecf9107cbaa78162bad7ea71f2f79b
parent fdbeaf63ecd7d586f387944388d3b81e421a9268
author Treehugger Robot <treehugger-gerrit@google.com> 1607202377 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607202377 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: If7f4b65be5ab86c90cea222028e6fa23c371a390