tree ec1446a2477335b56fed30142925e18bc3e52957
parent a3d23e5f94147b25ecb9268847abd7725fe0cc06
parent 64fe4bce7830e6a772a02c1b9772c36d17ad1ba4
author Bill Yi <byi@google.com> 1542139181 -0800
committer android-build-merger <android-build-merger@google.com> 1542139181 -0800

[automerger skipped] Import translations. DO NOT MERGE skipped: aa2d5f7f4c skipped: 693a6388cf am: b291bb2f1f  -s ours am: 00a36cf0ac  -s ours
am: 64fe4bce78  -s ours

Change-Id: I054a4e6c28109074fa4b61b89987f4c6d92d6591