tree 214a147fb493d38d41f3ac0eede244741c4ee6e8
parent 48e794dac4135a626b8b2135874331ffe3ace34f
parent 2138e5c0f6b78e0e248945da498bd716c928505f
author Baligh Uddin <baligh@google.com> 1354251964 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354251964 -0800

am 2138e5c0: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '2138e5c0f6b78e0e248945da498bd716c928505f':
  Import translations. DO NOT MERGE