tree 689cf430f83c28b9ba9c88db7868bc72c1dcecfd
parent 336114b4b7f1a2dbfa800d9d095cc5fa8b3cd53a
parent 6e1c70339e3560f2c1f3ea0a730c56bde372e4b7
author Treehugger Robot <treehugger-gerrit@google.com> 1607271463 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607271463 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: If84abf69c9d7284d6e95441d9d0bd6d7a3cb5b5d