tree 3ed3f8b1f523f95232b88dca8b5a59d3175a054f
parent c039634c25140173bcd81a243fa3ac5489b6b5d8
parent e2c21704ebcce1857fc2188ac379199f1d64f08c
author Bill Yi <byi@google.com> 1570816341 -0700
committer android-build-merger <android-build-merger@google.com> 1570816341 -0700

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

Change-Id: I314f9f020aa0aadaaee6560083ec807f323d02ba