tree 50ac9b8e513c632c46e0641e82a7012f2322bfc7
parent 7a723c68fec4075962d0cc0dcdfbee5a91e0ef90
parent f52e3c294be46bc824df15d137e5754d3d672ab3
author Bill Yi <byi@google.com> 1539600729 -0700
committer android-build-merger <android-build-merger@google.com> 1539600729 -0700

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

Change-Id: Ia76f70bfbe6eb8b29ac50de3ce08c36a5941b04d