tree 015fe1e4f29c33b68c93cb32029430c49b10e0e8
parent 56e86246e05c1eb9d2815ae0abbd05763b0acfec
parent a9cf884ea472ef92c10dc9aba9bb6766ce549112
author Baligh Uddin <baligh@google.com> 1413765014 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413765014 +0000

am a9cf884e: (-s ours) am ddacd6ac: (-s ours) Import translations. DO NOT MERGE

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