tree f15d2b219fc27314db39d6e4110478484f0e31bd
parent e946a4809062da40cc453182257a6a3e927deca9
parent 54a8f21d5839f6c473027149cc6238b95d0f919e
author Bill Yi <byi@google.com> 1542138060 -0800
committer android-build-merger <android-build-merger@google.com> 1542138060 -0800

[automerger skipped] Import translations. DO NOT MERGE am: 01a0bdc06a  -s ours
am: 54a8f21d58  -s ours

Change-Id: I1cd35c52c30f3c9c769a41ced47e2c939b9af4ca