tree 015fe1e4f29c33b68c93cb32029430c49b10e0e8
parent f7fd4f5ca7e1359a5c386f2547e9383076ed48a4
parent 1cffcc51feecf320995aa3289143f02e0d240c74
author Baligh Uddin <baligh@google.com> 1410886241 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410886241 +0000

am 1cffcc51: (-s ours) am fda0172a: (-s ours) Import translations. DO NOT MERGE

* commit '1cffcc51feecf320995aa3289143f02e0d240c74':
  Import translations. DO NOT MERGE