tree 513f39acbf2acce020bb6ab8438b580e946ebd3f
parent c0a49e9dc52fdb20450ddc1e39e094518994f92f
parent 8c5239a242a06ab0f1a5653d3aed515bf6037fb9
author Bill Yi <byi@google.com> 1555539842 -0700
committer android-build-merger <android-build-merger@google.com> 1555539842 -0700

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

Change-Id: Iff4466e1a3870222235ecf2d8030046d3ca4f702