tree a4715d80eec22ae510bf87338cc72a445c00da5d
parent 62a708f4e81b3a1565d977607d870adb9c410083
parent 286ecf1ea594059eb097b81709c0dc1ead246be7
author Baligh Uddin <baligh@google.com> 1392410256 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410256 +0000

am 286ecf1e: (-s ours) Import translations. DO NOT MERGE

* commit '286ecf1ea594059eb097b81709c0dc1ead246be7':
  Import translations. DO NOT MERGE