tree f9199c2fee2f5682e6a882086f84285ee10c574f
parent c44e3696c91ac161ac5401ad83604547a0fda00c
parent 36b5c967e11b065c97cd105496bf7fd7f6e1c2ff
author Baligh Uddin <baligh@google.com> 1365623080 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365623080 -0700

am 36b5c967: am 0cb19909: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '36b5c967e11b065c97cd105496bf7fd7f6e1c2ff':
  Import translations. DO NOT MERGE