tree 419c6339264309ab091b8423dcd100a94f499fec
parent cdff9ddfccdc84b8e19b684f3e437aca37c090f1
parent 4c737f27af5c01c62c03040c3b1a0d98329789a6
author Baligh Uddin <baligh@google.com> 1366054442 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366054442 -0700

am 4c737f27: am ce370671: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '4c737f27af5c01c62c03040c3b1a0d98329789a6':
  Import translations. DO NOT MERGE