tree 6e4642e124fefbb3cc2c75af94ed6b619eb21bcf
parent f26d010c394d26c3cfff165542348634fbcabd79
parent 0f35b4de14a8498e43005f487d5cdbb3fa067954
author Bill Yi <byi@google.com> 1568746472 -0700
committer android-build-merger <android-build-merger@google.com> 1568746472 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 8dda6713c0 -s ours am: 5f83b0c3ad -s ours
am: 0f35b4de14 -s ours
am skip reason: subject contains skip directive

Change-Id: I1b0e0452d8079ca8189e58fa59f7da9b6fabd4d3