tree afb057fa5e4976b11470feb8a1f6ebae8aab055c
parent 19e6a8c5c127e19b530dacb47fa8dbdc2f6cb497
parent 41b242c3339424129c2e4b799943f65af0858633
author Bill Yi <byi@google.com> 1573914801 -0800
committer android-build-merger <android-build-merger@google.com> 1573914801 -0800

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

Change-Id: Ic2f134238e098c6b337bbb2707b9abafbe39e397