tree 6e09d97e5d3d3fc35bb7e1b03d0c8cceb2ca9a86
parent a76359486a439b9aa83ec247f9b73559954b704a
parent 99548039a91f4176b92e45a7b6c8b667084d2b4d
author Bill Yi <byi@google.com> 1533392403 -0700
committer android-build-merger <android-build-merger@google.com> 1533392403 -0700

[automerger skipped] Import translations. DO NOT MERGE
am: 99548039a9  -s ours

Change-Id: Iee877848eaa4667a66451144e78d31958cdac590