tree 70f8bccc2e82531451b715038296b8aa553c75d1
parent 5e0a4a4e8150caec3f28e0884ae95bf4e69b57dd
parent 5f179e6eaf78eefe12dce74d37bf3c6fcaad73b7
author Baligh Uddin <baligh@google.com> 1394729459 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394729459 +0000

am 5f179e6e: (-s ours) am 441874b1: (-s ours) Import translations. DO NOT MERGE

* commit '5f179e6eaf78eefe12dce74d37bf3c6fcaad73b7':
  Import translations. DO NOT MERGE