tree b49676e6f882ecc8f919f139aadb65a29997e4d9
parent 46e6e2a00316fa8363eef7d2b962e63fe738c572
parent 3be76c87bbf41c20b0cec56a5ae15268cce0dac4
author Baligh Uddin <baligh@google.com> 1351543326 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351543326 -0700

am 3be76c87: am 6c96757f: (-s ours) Import translations. DO NOT MERGE

* commit '3be76c87bbf41c20b0cec56a5ae15268cce0dac4':