tree 238940a6753929c045802821e2700595c944c1d0
parent b6d0d96aa5a725c6b469d59ddd6d9374d743e5f1
parent 413ff620f9bb1e474ad62f20b0512fa5219bb263
author Bill Yi <byi@google.com> 1464973010 +0000
committer android-build-merger <android-build-merger@google.com> 1464973010 +0000

Import translations. DO NOT MERGE am: 73ed0f03ae  -s ours
am: 413ff620f9  -s ours

* commit '413ff620f9bb1e474ad62f20b0512fa5219bb263':
  Import translations. DO NOT MERGE

Change-Id: Ic9e4653b28fa35101061ee69e4e9b24131927828