tree 8d2afcce65ae10764f5f7fdb7087ffcb0fb2d962
parent 0494e46ca6e6e3cb0deeb81fc935330ada1c47eb
parent 517170834d362b7c5a26250f844cc96ec95c329a
author Baligh Uddin <baligh@google.com> 1354230932 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354230932 -0800

am 51717083: (-s ours) am 151eca64: am 7422f735: am 7c1000f6: Import translations. DO NOT MERGE

* commit '517170834d362b7c5a26250f844cc96ec95c329a':
  Import translations. DO NOT MERGE