tree 33b41468ff75e350ffdd075dfbadd74468f867ce
parent e3f016fb4ec2cbb11ef875b04d334dff2ed306d2
parent 151a7bb5020a46144d618a30624916eb58446517
author Baligh Uddin <baligh@google.com> 1462370641 +0000
committer android-build-merger <android-build-merger@google.com> 1462370641 +0000

Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 151a7bb502  -s ours

* commit '151a7bb5020a46144d618a30624916eb58446517':
  Import translations. DO NOT MERGE

Change-Id: I62cd8e2442fd1ed650685eb1c230535982eb22a4