tree 4ce3215693926ab94279f50f6c8520e4f05ca1fd
parent b9326717b48f36a067342849b644257ce6328433
parent 20aaab9dc01fbd49882adb6e721b5318def31962
author Baligh Uddin <baligh@google.com> 1442633148 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442633148 +0000

am 20aaab9d: (-s ours) am e3097e68: (-s ours) am 2f0660b4: (-s ours) Import translations. DO NOT MERGE

* commit '20aaab9dc01fbd49882adb6e721b5318def31962':
  Import translations. DO NOT MERGE