tree 135f5b9d6878f64ee1575c5ce78c8330f1f9438f
parent db9763e918f239e5c988bf9b291452522686eb8e
parent d5d067f2e88d84885ab26607b44ef9e494cc8c36
author Bill Yi <byi@google.com> 1479691988 +0000
committer android-build-merger <android-build-merger@google.com> 1479691988 +0000

Import translations. DO NOT MERGE am: 0f156bf40d  -s ours
am: d5d067f2e8  -s ours

Change-Id: I0f238325dd52951c41575fc3ae4efeeaec4e6821