tree 9b93deba282781ba4a3e3d8ee37f19f60c0826d7
parent 4139e43f91c241123cf08efddb1f67ffebcf5431
parent 77aeea8219663861f611757cf60617e8303531d9
author Bill Yi <byi@google.com> 1558191897 -0700
committer android-build-merger <android-build-merger@google.com> 1558191897 -0700

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

Change-Id: I245a084af19e6216e4c5b160e200cd03a1821be3