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

am 266749b5: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-queens

* commit '266749b5ab4482fa40351f77df8f681a63a88c30':
  Import translations. DO NOT MERGE