tree 6f3c0b52c14f44e5179fa6080f9fcc0c6b2cfdfa
parent 892b52f1516e0cd7b0c142fc6a390adc7e504895
parent 178807d590c1c873bd5eaae4c1cf331549fb6bbf
author Baligh Uddin <baligh@google.com> 1372735938 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1372735938 -0700

am 178807d5: am d6696b7c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '178807d590c1c873bd5eaae4c1cf331549fb6bbf':
  Import translations. DO NOT MERGE