tree 04ced860df565760b1e1fe82f19288ee99870e29
parent a4949fc8590322db64bd89ce8ca435a0b125db0a
parent a6815674fbad2b7fed54a1c39d6ff6b0d60d6dff
author Bill Yi <byi@google.com> 1477378843 +0000
committer android-build-merger <android-build-merger@google.com> 1477378843 +0000

Import translations. DO NOT MERGE am: 9351e5f083  -s ours
am: a6815674fb  -s ours

Change-Id: If23525cc76e53924486270674fe255fff31e6f1a