tree 1b6cd75fcf2cfb3481e2913c9a31db66ce9b8233
parent 705d318485ae6e9ca28ca4f2ccbfc404c980de68
parent c59fcd86c6d81e30839877c34a60664866f9a229
author Bill Yi <byi@google.com> 1507751657 +0000
committer android-build-merger <android-build-merger@google.com> 1507751657 +0000

Import translations. DO NOT MERGE am: 757057a5b5  -s ours am: 6fd592553c  -s ours am: fcde0eda85  -s ours am: bb04ab9aa1  -s ours
am: c59fcd86c6  -s ours

Change-Id: I55d7df7de1c5e3a98d1e773e9836f48522b3b49f