tree 8b94e02c49c01dfca4ce7bb4bc65af8664f45eb9
parent 4a0a42465b7cb2f486cdb2355e557fab7e8717ce
parent 88f76862cb263b97c78666e2f0ed81a88df45816
author Bill Yi <byi@google.com> 1560497166 -0700
committer android-build-merger <android-build-merger@google.com> 1560497166 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 00cced240d -s ours am: 1a7a0ecbc4 -s ours
am: 88f76862cb -s ours
am skip reason: subject contains skip directive

Change-Id: I4eb9db2e12439255b49e73f970b88c3fe1ff037b