tree 30dfb77d64207be276b439fa15a0fc5d99766172
parent 97ef85dc1ea302685dd9555e878f1c3a961eaaa9
parent 079e7159e52ebd1dae2f999180076b0f3d33be80
author Bill Yi <byi@google.com> 1513883763 +0000
committer android-build-merger <android-build-merger@google.com> 1513883763 +0000

Import translations. DO NOT MERGE am: 87741d6082  -s ours am: 15ceddaba5  -s ours
am: 079e7159e5  -s ours

Change-Id: Idb6ef21e2d27b9a6345ff5c68e08ddfe9e2024af