tree 628a212ab059a5b3b2307060f400ed523b8f2fd8
parent 96a0f6e570f7917a7d2eb9e3d83923b6ac8b004d
parent c3f22a4c2ddfa139b04a0ea126bea9af5d20b954
author Bill Yi <byi@google.com> 1550348223 -0800
committer android-build-merger <android-build-merger@google.com> 1550348223 -0800

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

Change-Id: I260e894a14bd59a487d3a9fd7468462994b9a379