tree 3215c975f8a2c385e00c2b845697ae8a72969bfb
parent a0b5d261bf4791f94b9f7185f6fc57f995233700
parent ccb9f5b66ee64f60aeed422f73b3b9a5da6a01e7
author Baligh Uddin <baligh@google.com> 1358458408 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1358458408 -0800

am ccb9f5b6: (-s ours) Merge "Import translations. DO NOT MERGE"

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