tree c2871e38854566ad88cbbc2165b728f73a8eb4eb
parent 2b42e5dcc0a8b0d535d88898330e72ea134d4e03
parent fb21a20de5e38c68863da0abbda5e25609783888
author Bill Yi <byi@google.com> 1560484217 -0700
committer android-build-merger <android-build-merger@google.com> 1560484217 -0700

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

Change-Id: Ib754f5c564d9f5111d813f06d868c5e00fd337a0