tree 5dd230bab023dcb1d74302ec7bc8d5a2a4411652
parent 7628b693a1ccd4243696142e9d82012878cce49c
parent 56924a822d3e96a4ef9038f1f34750c216c6e438
author Baligh Uddin <baligh@google.com> 1400009872 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400009872 +0000

am 56924a82: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-nova

* commit '56924a822d3e96a4ef9038f1f34750c216c6e438':
  Import translations. DO NOT MERGE