tree 8d2afcce65ae10764f5f7fdb7087ffcb0fb2d962
parent 012dfef735bde3adda165e5add78b61c1a9862c3
parent 3ba74d4bbea491b9d18478557e472e40deabd777
author Baligh Uddin <baligh@google.com> 1354228855 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354228855 -0800

am 3ba74d4b: am 582e13d1: Import translations. DO NOT MERGE

* commit '3ba74d4bbea491b9d18478557e472e40deabd777':
  Import translations. DO NOT MERGE