tree 6278717d5cc2a0079a316a415a7e2ee392a35472
parent 71e9facb9a2bf61cfef31f5bd5b8f175e2b5a862
parent 461e8ec49c3251d793e04c7ee0374d0257940f49
author Bill Yi <byi@google.com> 1470781347 +0000
committer android-build-merger <android-build-merger@google.com> 1470781347 +0000

Import translations. DO NOT MERGE am: 76ba37f81e  -s ours am: 8189f1ff66  -s ours am: df93c5b7c6  -s ours
am: 461e8ec49c  -s ours

Change-Id: I15cfc65f81bab6dd63cc70fb8c5fa58e9f8dcf97