tree 3a00a881989b0e2a5405be2e6ddc66106a0e77a4
parent adab7c9693f491ebc6121c9b253dc3a1f98816db
parent 02befc32293351a93a1ba073ff884e6135c0c121
author Bill Yi <byi@google.com> 1464318118 +0000
committer android-build-merger <android-build-merger@google.com> 1464318118 +0000

Merge "Import translations. DO NOT MERGE" into nyc-dev am: 9aed8c2fa0  -s ours
am: 02befc3229  -s ours

* commit '02befc32293351a93a1ba073ff884e6135c0c121':
  Import translations. DO NOT MERGE

Change-Id: If60580203a307385c138d41f41790e8ca3852120