tree af78e6fc5084d162dd321e56e718c16306579024
parent e21e19ec4d280e041bed37a435827c52f2c4b46b
parent 3c7cd66c754cc4171e975b02a5c2f56dc76107b0
author Bill Yi <byi@google.com> 1571422682 -0700
committer android-build-merger <android-build-merger@google.com> 1571422682 -0700

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

Change-Id: I375e3c95f5d00750f09b20061d6f65d3d470bdeb