tree c4f4300ed3a27f48410cc7188a36a83a23a71645
parent 9e6a7a76fa2778b7e8aef326cfbed2252b8ae84a
parent 6aa71b3aefca3f90f8cf7369162fb0624cbd8769
author Bill Yi <byi@google.com> 1547938207 -0800
committer android-build-merger <android-build-merger@google.com> 1547938207 -0800

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

Change-Id: I581abc912bee99a4bbf9e93b5c024b1002205537