tree 7ab926c1d670417ccd4b8581c9bf49bb78d5d357
parent 0493fb93f34fda61d46c5aec4ccbd08d2e1c541e
parent 458a15f732c380dc4ef3b7dbcae2a6a8f5916f09
author Baligh Uddin <baligh@google.com> 1383797672 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383797672 -0800

am 458a15f7: (-s ours) am 89fbe00d: (-s ours) am 0491f0f1: (-s ours) Import translations. DO NOT MERGE

* commit '458a15f732c380dc4ef3b7dbcae2a6a8f5916f09':
  Import translations. DO NOT MERGE