tree 0938added13c4e331a782fe2a35e8fbb31b5493c
parent d6c7523ce3230346605e5d73c0fc279a32086a9a
parent 2d0cac8d0c85dedbe7eb7988dc53197177f9c7b3
author Bill Yi <byi@google.com> 1470781802 +0000
committer android-build-merger <android-build-merger@google.com> 1470781802 +0000

Import translations. DO NOT MERGE am: 5403c74434  -s ours am: 0d92f75de4  -s ours am: 29bbea374c  -s ours
am: 2d0cac8d0c  -s ours

Change-Id: I5586349d112713332690340b075457da662d66da