tree 86572917c18244f76bda58a0753e52c957164227
parent 17da719d0f19326eb96e1dd351bff7a97f78742e
parent a9174a7fd7bbf8dd930ea6de9ba8630405f58dff
author Bill Yi <byi@google.com> 1555109507 -0700
committer android-build-merger <android-build-merger@google.com> 1555109507 -0700

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

Change-Id: Id5873d9f6e31d126b3b7aa6859f221f16cf7a1f6