tree 1cd5b0c2cb2797d48b8beba5aca1fcdfbc199fbd
parent e70536e8b9a87cc2132974c7d3ce0398a39b7718
parent 2c49e5874a96f178c5b3d183cbd2eca54cfd7f12
author Baligh Uddin <baligh@google.com> 1351013802 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351013802 -0700

am 2c49e587: (-s ours) am a5e9ff92: am f46ac5c3: Import translations. DO NOT MERGE

* commit '2c49e5874a96f178c5b3d183cbd2eca54cfd7f12':
  Import translations. DO NOT MERGE