tree 6367992681dfe95b532d32eae2285f77cf5df29f
parent d20c8d7fdb5f7075a8e6bdc15a22a85370da7029
parent 41c5dcaad08fd7b5acab0055fd3d5743a55d0e30
author Bill Yi <byi@google.com> 1513878324 +0000
committer android-build-merger <android-build-merger@google.com> 1513878324 +0000

Import translations. DO NOT MERGE am: a829ea2a1b  -s ours
am: 41c5dcaad0  -s ours

Change-Id: I510a98e91b45c31fa060b414f59e9a25a8aeda92