tree 3010d53d92af3db24119116995f3c754c13f9196
parent 48539dbf44898826967bf5afcf644c562e26fd0e
parent 4e16abf8d8d16196276dffc50e5df3f41c869024
author Baligh Uddin <baligh@google.com> 1403294236 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403294236 +0000

am 4e16abf8: (-s ours) am f21eb597: (-s ours) Import translations. DO NOT MERGE

* commit '4e16abf8d8d16196276dffc50e5df3f41c869024':
  Import translations. DO NOT MERGE