tree 0964c39fb8f8231143a644f7590280721cc39982
parent 8a312ab7797ccde12de610d1364dc45a4f49fd7d
parent 599b561ff1d04f4dac7d2a266b1f32f1bedb2473
author Bill Yi <byi@google.com> 1541908117 -0800
committer android-build-merger <android-build-merger@google.com> 1541908117 -0800

[automerger skipped] Import translations. DO NOT MERGE skipped: 0697e9e6d7 skipped: b702eb1807 am: 5e3def3f70  -s ours
am: 599b561ff1  -s ours

Change-Id: I6931f8b42325661d01f6a58c969bb571675038f1