tree 9548ad109611983087158933fe337b58a1cf6fef
parent ac9ef5084a0a98d4020f53689395eb121bbbf2e7
parent 3f2418976d97770bc0cc9aa006e36d84a8e2d426
author Bill Yi <byi@google.com> 1497621044 +0000
committer android-build-merger <android-build-merger@google.com> 1497621044 +0000

Import translations. DO NOT MERGE am: 5098e36f01  -s ours
am: 3f2418976d  -s ours

Change-Id: Ic4323799ecae40a257fd3e68380550efe70d9a2d