tree 779632923445dd7d4683f40bd7bcc2736054f046
parent 00cd25e1b967a0ed334a98f7a895ef8072c9f4cc
parent 85b52764c54cc9e3717725a8ce49589ac93bf97c
author Baligh Uddin <baligh@google.com> 1408232556 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408232556 +0000

am 85b52764: (-s ours) am 3ff86ed3: (-s ours) am 4c107d98: (-s ours) am 0b911c89: (-s ours) am fe641ddf: (-s ours) Import translations. DO NOT MERGE

* commit '85b52764c54cc9e3717725a8ce49589ac93bf97c':
  Import translations. DO NOT MERGE