tree 27f0a94392c60802ae55ba6c63b56156cf66ce48
parent d2e71d465467acf8420ddd1e3bebbba2189e49c8
parent 56faf220517ade1a2bc9313293cb80c7d759f042
author Baligh Uddin <baligh@google.com> 1384405239 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384405239 -0800

am 56faf220: (-s ours) Import translations. DO NOT MERGE

* commit '56faf220517ade1a2bc9313293cb80c7d759f042':
  Import translations. DO NOT MERGE