tree 8e32c616bdf58008d0d9fa3d27e66a51474eea26
parent f644405a457e1ad8afa489facfa02ac52d6004e0
parent a09f7c3f4e49ee052e1246db1bb6c16b19a711db
author Bill Yi <byi@google.com> 1475801002 +0000
committer android-build-merger <android-build-merger@google.com> 1475801002 +0000

Import translations. DO NOT MERGE am: d2671e488d  -s ours am: d6f07c492c  -s ours
am: a09f7c3f4e  -s ours

Change-Id: If24e2560ef0eaf3020640659344985c8bdae56cc