tree c8d9bc0456ab9f268ad7f1f69f55af28689f81e9
parent 2a950150aa11101f417fe2c41bafcceb42675691
parent fd3446b8d2c41bb14aaa22427b59b35ab9e47a17
author Baligh Uddin <baligh@google.com> 1380897059 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380897059 -0700

am a2ba4d5a: (-s ours) am 19411cda: (-s ours) am da5cd8c4: (-s ours) Import translations. DO NOT MERGE

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