tree 7fc5b48a1dbcb443716a7a85f9249ac35b0f1210
parent 4f7dfbb2dbde8020c0cee268e6f813d0d1179360
parent 90a4fbf860e006fdf1658a49bc3e83c2a2af4099
author Bill Yi <byi@google.com> 1529949466 -0700
committer android-build-merger <android-build-merger@google.com> 1529949466 -0700

[automerger skipped] Import translations. DO NOT MERGE
am: 90a4fbf860  -s ours

Change-Id: I090fcf16ac112c4f1ad5cc9b49425c667502e5c0