tree a4715d80eec22ae510bf87338cc72a445c00da5d
parent bb69c0d85cdfa60f7b62a35e26c361777aaedb60
parent 0493fb93f34fda61d46c5aec4ccbd08d2e1c541e
author Baligh Uddin <baligh@google.com> 1392410257 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410257 +0000

am 0493fb93: (-s ours) am 0effb652: (-s ours) am e0b9a1f7: (-s ours) Import translations. DO NOT MERGE

* commit '0493fb93f34fda61d46c5aec4ccbd08d2e1c541e':
  Import translations. DO NOT MERGE