tree 94c6c3a8e3b1b178ebe6c1525c98f748ae003031
parent 48186ba0339578fcbea269a900ebaeb0030c396a
parent 1ac05dfa4a4de5bd9cad4d637917df0537cfa457
author Bill Yi <byi@google.com> 1538374849 -0700
committer android-build-merger <android-build-merger@google.com> 1538374849 -0700

[automerger skipped] Import translations. DO NOT MERGE skipped: 6105ad5932 skipped: e50fc63e3d am: 20ce1f4c33  -s ours am: 2e250a6542  -s ours
am: 1ac05dfa4a  -s ours

Change-Id: Ibcae61eb77aba125de97dfe65f78725bc5dd0a1c