tree 65ad60498882e08f6999681fc18efb1508a9a62a
parent 2ee107fc581660e9568f8121fa1c3cfb2b7e4743
parent b2b50ed09a0447ccc50bd8de6ae1ce25f13946cc
author Bill Yi <byi@google.com> 1558217764 -0700
committer android-build-merger <android-build-merger@google.com> 1558217764 -0700

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

Change-Id: Ic42a6601ecd51f85f8084ba918f8af1c44bc125a