tree 57b59b5d0fb233cc626f7f09a3dc2dbb7d87b05c
parent cafa9ee765e7de50675cf6a757bc71a4b430f2dc
parent ac72cb15838b9312d72fc40bd5c2e21228197baa
author Bill Yi <byi@google.com> 1464999838 +0000
committer android-build-merger <android-build-merger@google.com> 1464999838 +0000

Import translations. DO NOT MERGE am: 431ffdc8d6  -s ours am: 53f5af79f1  -s ours
am: ac72cb1583  -s ours

* commit 'ac72cb15838b9312d72fc40bd5c2e21228197baa':
  Import translations. DO NOT MERGE

Change-Id: I53a9c1788925f3353255a2133296ef74f4862869