tree 52e6206a4bfaaae3017a871aecc0bde01e34a1e5
parent a244de2c7d9eecf3978ecc8c31e6527946572c9c
parent b8e46033c4ba977fffe70dbee1c9b8d7983d8e04
author Baligh Uddin <baligh@google.com> 1381033674 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381033674 -0700

am b8e46033: (-s ours) am ee817344: (-s ours) Import translations. DO NOT MERGE

* commit 'b8e46033c4ba977fffe70dbee1c9b8d7983d8e04':
  Import translations. DO NOT MERGE