tree 4d7344e91213df47acf9400b817ce7a7951dfb77
parent d42d627f364ebb33e28a3641a8eca3b9580ee2ea
parent 46b2946ffbab18e66be7e2cdbc69ad2d3aaad47d
author Bill Yi <byi@google.com> 1491106115 +0000
committer android-build-merger <android-build-merger@google.com> 1491106115 +0000

Import translations. DO NOT MERGE am: 64b7df195d  -s ours
am: 46b2946ffb  -s ours

Change-Id: I2b1b2757ce57268ac0fe6a768ef8eb25bcb2f5f7