tree a4715d80eec22ae510bf87338cc72a445c00da5d
parent 1b2ee8c1b3a525f02cf2d302744cf4c868985f5c
parent 572bdaa47484f38cc46a8507231cfec51b3c2e13
author Baligh Uddin <baligh@google.com> 1392410256 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410256 +0000

am 572bdaa4: (-s ours) am f0d79e57: (-s ours) Import translations. DO NOT MERGE

* commit '572bdaa47484f38cc46a8507231cfec51b3c2e13':
  Import translations. DO NOT MERGE