tree 94c6c3a8e3b1b178ebe6c1525c98f748ae003031
parent 26fb62b0aacdaad51d0e8b13f30caa567d01b0e5
parent 3e8f4b1f59102ec0eba2cbfdff5e6960cd147418
author Bill Yi <byi@google.com> 1538376360 -0700
committer android-build-merger <android-build-merger@google.com> 1538376360 -0700

[automerger skipped] Import translations. DO NOT MERGE skipped: b19a62bcf8 skipped: 5883bd3177 am: 1e00122904  -s ours am: 8efa418123  -s ours
am: 3e8f4b1f59  -s ours

Change-Id: Ia7da5db7838f04b8cee2375de5abb85db9949c55