tree 4489427f70fe0ebedc647f008368c8efc0048346
parent 8ebe008a0da81c40a5b21b7fab4fdb315fb98910
parent 2a676e1a4174d09e4b15f541d3c7d28caaca6c88
author Bill Yi <byi@google.com> 1571200856 -0700
committer android-build-merger <android-build-merger@google.com> 1571200856 -0700

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

Change-Id: I09907f4240718008feef983ab741ca07774511f3