tree 474b4d9ac61045d0da5aaf221dc6b077a1f1c8a1
parent 2b8534dd43f5de68a5aa78de95855f4a9a1a800b
parent 7a6bb64c3117763b79456b9d4969076d2450c320
author Bill Yi <byi@google.com> 1513804999 +0000
committer android-build-merger <android-build-merger@google.com> 1513804999 +0000

Import translations. DO NOT MERGE
am: 7a6bb64c31  -s ours

Change-Id: I6332fa1e10e57b2c294505010a0fee7f53f9ca2f