tree 163a359ec20b9dfe12a3b517d21d09cdc957cd53
parent 8aacdf493762861b883696ed79bb52ab6039b97f
parent 243274642748a3ab0e66c902ef518b5331d05d8b
author Bill Yi <byi@google.com> 1478328109 +0000
committer android-build-merger <android-build-merger@google.com> 1478328109 +0000

Import translations. DO NOT MERGE
am: 2432746427  -s ours

Change-Id: I720cebe22a90dfc359b6e1a7613459788de79ef4