tree a0b2438b9d3177c72e614ff98bb903c308a1da74
parent 3e31a0dc91600034b32cdb53e72bbb96ddc75317
parent f64e70fd045c2a786e3d3edf880d806e93beec3b
author Baligh Uddin <baligh@google.com> 1351547666 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351547666 -0700

am f64e70fd: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'f64e70fd045c2a786e3d3edf880d806e93beec3b':
  Import translations. DO NOT MERGE