tree e9124f9a4b705e936dbc84ae61795ed41af94681
parent ae1042ff2a6f39f21b4e313b277f7eae5f20e66b
parent 1126d505a0858c448bc4913660123cfa7d4884a3
author Bill Yi <byi@google.com> 1561070347 -0700
committer android-build-merger <android-build-merger@google.com> 1561070347 -0700

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

Change-Id: Ief809b01ce573a7651e7a7c272db16986f039b69