tree 605e8afe4a230dc956db46e9f5c3ffb74b5d4890
parent 60d4545611ade0fffec6a618779fffce27e1ca35
parent 0aa0611f9c6775575da56a1746fef1cf68267b0e
author Bill Yi <byi@google.com> 1491121680 +0000
committer android-build-merger <android-build-merger@google.com> 1491121680 +0000

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

Change-Id: Ib858566d015e1ed36f461dbc2bab302195741154