tree c1b93d8419fc2e77c895af1ca314baafb22808de
parent 8494d77b54b702a3ce9733c788d50cc4870373a4
parent 68eb6f7bae63b7d6f1de4aa8000a9c44cfb87d95
author Baligh Uddin <baligh@google.com> 1409159798 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409159798 +0000

am 68eb6f7b: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop

* commit '68eb6f7bae63b7d6f1de4aa8000a9c44cfb87d95':
  Import translations. DO NOT MERGE