tree 47695d3e1cbf6aee8287858a151956ffcd8ce500
parent 3de14ebfa21d8d7d5d41dea1dd1b79e9033e10ae
parent e60e0d22916bdf6af214b2f3ff0237b6daf71ac7
author Bill Yi <byi@google.com> 1547937963 -0800
committer android-build-merger <android-build-merger@google.com> 1547937963 -0800

[automerger skipped] Import translations. DO NOT MERGE
am: e60e0d2291 -s ours
am skip reason: subject contains skip directive

Change-Id: I27259294f2360a745415605afaf325e37fe8c565