tree ef24a7584ae2d4d11efcdc3d051fe9c690188132
parent dc8c7c9e86a4ead3e2487a6195fc8b713af47f76
parent 15ecba0f8258e3c7d88defdad014c3f3a86d44e9
author Baligh Uddin <baligh@google.com> 1383694199 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383694199 -0800

am 15ecba0f: (-s ours) Import translations. DO NOT MERGE

* commit '15ecba0f8258e3c7d88defdad014c3f3a86d44e9':
  Import translations. DO NOT MERGE