tree c3d17c067c75a03f1b6a5aae7ba4bc3ece1c3ff9
parent 47559fb858221d99655188f51642f7644ca4fd37
parent 8b6ea60facc33c973d1a8c432b91bbade851415c
author Bill Yi <byi@google.com> 1496249861 +0000
committer android-build-merger <android-build-merger@google.com> 1496249861 +0000

Import translations. DO NOT MERGE
am: 8b6ea60fac  -s ours

Change-Id: I12822e9c629ed902c61db1aab8e93c755245449d