tree 9ef722717215b2037f25cb696a1b8c3ef1b6f05d
parent e46d01fde871fd2c8defaf92b4c24951daece38c
parent 6afc9a3f385334612f820d07de3efcf9f4865057
author Baligh Uddin <baligh@google.com> 1404755619 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404755619 +0000

am 6afc9a3f: (-s ours) am 2d4887d7: (-s ours) am 0febc0c3: (-s ours) Import translations. DO NOT MERGE

* commit '6afc9a3f385334612f820d07de3efcf9f4865057':
  Import translations. DO NOT MERGE