tree 01cbc5d424435bbc62da92b109a71d0ddc51ae41
parent 266749b5ab4482fa40351f77df8f681a63a88c30
parent bc566e745a8313ee63944d2e41b8f7b08d07f7cd
author Baligh Uddin <baligh@google.com> 1409607836 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409607836 +0000

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

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