tree 0643645ba90ba666ddf7ff7188aba1ea145193de
parent bf789ba0d1e78633b45cd1df357a39d6e2e11a0c
parent 0c31d81cd15b529f91070b1b00db9e9fb9e08ad5
author Bill Yi <byi@google.com> 1531424719 -0700
committer android-build-merger <android-build-merger@google.com> 1531424719 -0700

[automerger skipped] Import translations. DO NOT MERGE skipped: f4037fb69e skipped: 741c97faa9
am: 0c31d81cd1  -s ours

Change-Id: I404ba441a96f77be638d89c0c43f950200a94376