tree b97c59214edd481187a31f1213f981d76c585fe1
parent c6d57d67d614d1b5292dd3a8a3a7fd18455a9851
parent 37b4a4b09533b56bcc675c4ce9cee72bce52da51
author Bill Yi <byi@google.com> 1491121734 +0000
committer android-build-merger <android-build-merger@google.com> 1491121734 +0000

Import translations. DO NOT MERGE am: f378cd950b  -s ours am: 19d5f181e2  -s ours
am: 37b4a4b095  -s ours

Change-Id: I6cbea49fe30dc3f420b92eed6a37abbfaaeda787