tree 2ac7e942a9d6401b4132f938ec41a9a857647d62
parent 51ec5967af4c6cdca64a580b515fb8dbefeea0c2
parent cbaf1505a077cc2622e1421a729c3d36808d9db9
author Bill Yi <byi@google.com> 1541901899 -0800
committer android-build-merger <android-build-merger@google.com> 1541901899 -0800

[automerger skipped] Import translations. DO NOT MERGE skipped: cfd1e141b9 skipped: d9cf1de3e4
am: cbaf1505a0  -s ours

Change-Id: I362c59a89efba73b45a9a5d81474cac8448c2f84