tree 1743c4012e1d2943b93d073522a106abed0f950b
parent d67a595422f467f13e6474a80b9915b9fca1bc19
parent 004945aeac5add82f59c2ae60f2af08e198452a6
author Baligh Uddin <baligh@google.com> 1354849121 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354849121 -0800

am 004945ae: am 6e61c1d4: Import translations. DO NOT MERGE

* commit '004945aeac5add82f59c2ae60f2af08e198452a6':
  Import translations. DO NOT MERGE