tree 1f45fb29de6b2e757e67a4dde724005a67f5f689
parent 3746649f7aea85a11de801a73e44a61f7f86e458
parent 73aebe51559be895ef2d82e154bec8fee027ab04
author Bill Yi <byi@google.com> 1527107083 -0700
committer android-build-merger <android-build-merger@google.com> 1527107083 -0700

[automerger skipped] Import translations. DO NOT MERGE
am: 73aebe5155  -s ours

Change-Id: I1793cd11f1459dc52738e580979aa25375ff4e6d