tree 3676da4cd604666219228e80d448d625f3b8e94d
parent 3eee8711e00f503f4c837598acd6c62339b284bd
parent 996f96060ee8dc9c23ee956bc7a7343a07a28e94
author Bill Yi <byi@google.com> 1569642047 -0700
committer android-build-merger <android-build-merger@google.com> 1569642047 -0700

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

Change-Id: Id1d79fde2e4e9af339e5a9750b8368c66f534c9a