tree a4715d80eec22ae510bf87338cc72a445c00da5d
parent fdfebdad758d9f140c89e4725ca10a265b9d81b2
parent 8eb857fa9b3f956e428e3c1027ac37da63cfc1c1
author Baligh Uddin <baligh@google.com> 1392410257 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410257 +0000

am 8eb857fa: (-s ours) am 458a15f7: (-s ours) am 89fbe00d: (-s ours) am 0491f0f1: (-s ours) Import translations. DO NOT MERGE

* commit '8eb857fa9b3f956e428e3c1027ac37da63cfc1c1':
  Import translations. DO NOT MERGE