tree 9840b0eb750ae54cea08f93170f8069bc79e7577
parent 969b3b9a65e75070a097021d2e97a425e31d6d8a
parent e68e16a75fb1c01280cb597027772567add02991
author Bill Yi <byi@google.com> 1471074203 +0000
committer android-build-merger <android-build-merger@google.com> 1471074203 +0000

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

Change-Id: Ieae2c79f05d698807b2e8936bdf30002c1f5423f