tree d1a91df7d3c0c5477aefcbf289d75b99c7e96644
parent 36b5358c699d5c81ff6610cf228ac97bf66ad74e
parent 67ca0b7080133ca9469327b2860ba3acbccc12fc
author Baligh Uddin <baligh@google.com> 1410887179 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410887179 +0000

am 67ca0b70: (-s ours) am 04887e4d: (-s ours) am 63c4a166: (-s ours) Import translations. DO NOT MERGE

* commit '67ca0b7080133ca9469327b2860ba3acbccc12fc':
  Import translations. DO NOT MERGE