am 56888a2a: (-s ours) am b4353615: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Fri, 31 Oct 2014 17:12:09 +0000 (17:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 31 Oct 2014 17:12:09 +0000 (17:12 +0000)
commit59405a181ad8fcf34ee194bb86f580ade1ae0233
treedba16217600dd2208b2814f59ede112b2032daa8
parente276e3c34eb6eb81220daacb5ab977433665d947
parent56888a2a22df994197e64cf4f1e9ed6c008a37f0
am 56888a2a: (-s ours) am b4353615: (-s ours) Import translations. DO NOT MERGE

* commit '56888a2a22df994197e64cf4f1e9ed6c008a37f0':
  Import translations. DO NOT MERGE