tree c68137c5bdd60ffcc67f7f7ce16564b8587ded20
parent e94d08b92b34f1a78da7a15d50a6c6c071884dd6
parent b77922f304f3b6a9cefa3035830c666923730859
author Bill Yi <byi@google.com> 1539696356 -0700
committer android-build-merger <android-build-merger@google.com> 1539696356 -0700

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

Change-Id: I65cf2e889dc920b38f0935bae22595956a153d04