tree f2cc1c88198ca6fc0a5526eab81b87074d109c46
parent 4d05024331ce934d20b6a9afb7803539f5d85fa0
parent a003c8ede8026fac754c059c90fde5bc9ba6e309
author Baligh Uddin <baligh@google.com> 1392936362 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392936362 +0000

am a003c8ed: (-s ours) am 4487e0aa: (-s ours) am beb7bc60: (-s ours) Import translations. DO NOT MERGE

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