tree 5babd8338e5cd14b2492ab6013943919e004ae43
parent 2581f0ac14b158f9fb8c76cdab8e7c039a84d865
parent ecaaf12629ae88963204814a5647caaf8f6de7a3
author Baligh Uddin <baligh@google.com> 1408231405 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408231405 +0000

am ecaaf126: (-s ours) am 3cc88277: (-s ours) am 122d534e: (-s ours) Import translations. DO NOT MERGE

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