tree 7b9fcd939dc9e9865edde5adfc34418816d3ca5b
parent 4f4220c1bd406cb1ae21e5e4e98ee654e518af43
parent a3aa0dc5db2dafcd41a8c93ac6aae686c562e1c0
author Bill Yi <byi@google.com> 1479692049 +0000
committer android-build-merger <android-build-merger@google.com> 1479692049 +0000

Import translations. DO NOT MERGE am: cd1c178395  -s ours
am: a3aa0dc5db  -s ours

Change-Id: I63e31f9e3f693de8cb129e317b734cdadede8523