tree fc1b7acefa56b90dd63be8790d64ffdafcb1c2fd
parent 72e14a9f13c94e751ef15b888d06029bcc4c5605
parent 97a6cdc90d4ea6820175da967a8d00a6d0ed1914
author Baligh Uddin <baligh@google.com> 1380918840 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380918840 -0700

am 672aaa1e: (-s ours) am 92728d02: (-s ours) Import translations. DO NOT MERGE

* commit '672aaa1e255e53e7dc73e0312cfd69a3b4d308bf':
  Import translations. DO NOT MERGE