tree 87460bb4c9b4c8d6f51fbe8a26de347ed493653b
parent a653fbb1cc9f2344cff72a828c083e8cdecd12fb
parent 3992735e00fe0d7df82b41123ed7afe36d50037d
author Geoff Mendal <mendal@google.com> 1389900179 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389900179 -0800

am 3992735e: (-s ours) am 43323cc3: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit '3992735e00fe0d7df82b41123ed7afe36d50037d':
  Import translations. DO NOT MERGE