tree 7863a831b4fd592029672ffcda0db60f0d0697c0
parent abd098801198a696914e4d2ccaae95ed9fa3f944
parent 47a78999ea8719359bf704db3bbe96db214d51fd
author Baligh Uddin <baligh@google.com> 1461794659 +0000
committer android-build-merger <android-build-merger@google.com> 1461794659 +0000

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

* commit '47a78999ea8719359bf704db3bbe96db214d51fd':
  Import translations. DO NOT MERGE

Change-Id: If34b4be21c2bb75300c5aaf9fd1ef03a22a5f001