tree cce35e9b04e4971de4aa05635f9f69b39a8c4e41
parent bac2ad743be9cab62f2e387e90a05a4b9fbf8f7f
parent d19aba43cd7f0204fafcd2af8c69df8436b4ce44
author Bill Yi <byi@google.com> 1479695088 +0000
committer android-build-merger <android-build-merger@google.com> 1479695088 +0000

Import translations. DO NOT MERGE am: 521b3d5259  -s ours am: db8719a721  -s ours
am: d19aba43cd  -s ours

Change-Id: I8a0451022b919ce20e19f1076e5759522c211596