tree 6ee493750854a9b556fb8db3fa879d49590f51f2
parent 158d1fa8a1d2017e778819082e50b424785dd145
parent d1c80691c8b7514347edf5ec88ce21f421ddd816
author Bill Yi <byi@google.com> 1566246056 -0700
committer android-build-merger <android-build-merger@google.com> 1566246056 -0700

[automerger skipped] Import translations. DO NOT MERGE
am: d1c80691c8 -s ours
am skip reason: subject contains skip directive

Change-Id: I79acd40f5aa64928606ee670f7fec8acd266a081