tree 1bed68cef9e1d5bf3f8738f9e3d7e419909c1189
parent d5691515ca2cdbb8e821e597e83a46c6ca206a15
parent 5dac1e08eaba17b6a03a035b80ca3ddc4479a301
author Bill Yi <byi@google.com> 1504061684 +0000
committer android-build-merger <android-build-merger@google.com> 1504061684 +0000

Import translations. DO NOT MERGE am: c16d222593  -s ours
am: 5dac1e08ea  -s ours

Change-Id: Ic2750e22865b1f053548a66aad3ad7ca2cd58ea9