tree c4559b4c9c6fe85e88fd9a764dbd90652a0843a3
parent a49a8275e102276d1633830ee4afc8ca83320100
parent 2a224c7028b89dd55086f3d3317bdc265ae433d5
author Bill Yi <byi@google.com> 1467323398 +0000
committer android-build-merger <android-build-merger@google.com> 1467323398 +0000

Import translations. DO NOT MERGE am: 7bbd1e4029  -s ours
am: 2a224c7028  -s ours

Change-Id: I497a2e62e1715874d44148875aec1c6d4e7647c1