tree df5002817ff3dccadf02acdfc0c0377575363479
parent 9a953b102234299d5b31383535235f1a82a60f3a
parent fd474f8dc8ae0cbc936a32f52a63deacc7efcf7d
author Bill Yi <byi@google.com> 1538375854 -0700
committer android-build-merger <android-build-merger@google.com> 1538375854 -0700

[automerger skipped] Import translations. DO NOT MERGE skipped: 73a5116af8 skipped: b5f88962d5
am: fd474f8dc8  -s ours

Change-Id: I81cfcdf20b7c53f16b50d217d231713589c31a5e