tree 828e6622b4bef017d4f1ed38691b214551f0a50c
parent a96d2db281c4326a8a4017261286a6ba5cdd07e3
parent 2f6ed69b53b546261291c070c39b71baa52c1f03
author Bill Yi <byi@google.com> 1544568630 -0800
committer android-build-merger <android-build-merger@google.com> 1544568630 -0800

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

Change-Id: Idfa442e3aeeea9866bd38c7b18ae8311c5051368