tree d6015532bd3f7b4882438bdcae7e1e33ea7e2120
parent 35f470d8ddefbb214fccc8d672475fe20a5ee12c
parent 47ef29c508f2b151292bcb71c2c7e5e865697509
author Baligh Uddin <baligh@google.com> 1380991487 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380991487 -0700

am 47ef29c5: (-s ours) am 4926a0f5: (-s ours) am 3d36b4a1: (-s ours) Import translations. DO NOT MERGE

* commit '47ef29c508f2b151292bcb71c2c7e5e865697509':
  Import translations. DO NOT MERGE