tree f25483293ecf7f4b8f3a3d5f2c547909a8a2bb1d
parent 8c5239a242a06ab0f1a5653d3aed515bf6037fb9
parent 2aeb8856760ecb8f6f9d5fb8bd146b8ff17063b6
author Bill Yi <byi@google.com> 1558192267 -0700
committer android-build-merger <android-build-merger@google.com> 1558192267 -0700

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

Change-Id: I31bb5b947534de90014831cde3ea735ae6b459d4