tree 01cbc5d424435bbc62da92b109a71d0ddc51ae41
parent 1e44e0aa30276680eade0982a2a5b253118244a5
parent b17186c7a451c29ff370aa0d8b590b2d10a600f4
author Baligh Uddin <baligh@google.com> 1409608300 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409608300 +0000

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

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