tree a6859334cafbf4e5bd2e3367af9f6bac9362612a
parent 03797f056265580f56617c9f1427c87333c2b84b
parent 97360f90ce2015f56b860692dabe0aa82786a888
author Baligh Uddin <baligh@google.com> 1463959940 +0000
committer android-build-merger <android-build-merger@google.com> 1463959940 +0000

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

* commit '97360f90ce2015f56b860692dabe0aa82786a888':
  Import translations. DO NOT MERGE

Change-Id: I0cb6ae304f8c8980d5c3f78773e20aa354a02940