tree 83899c2df1cb6136702232dfd522e07f3de68670
parent 79a231ae945f8ff8347064838349d191fb0e153b
parent f26bcb1967473181afddef40d0fa79c02e953255
author Bill Yi <byi@google.com> 1564177600 -0700
committer android-build-merger <android-build-merger@google.com> 1564177600 -0700

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

Change-Id: I969eb28a5b0edf217737c3b8ea9136c5435456b5