tree 28ec860a4a1742fa4daa4cec08da9d2b9780418c
parent cd58e223d0c4828c7dd19d63faacde6941edd6fb
parent e8cc0905e0cd083e2fe5aeb5967fb29cbe1bad1b
author Baligh Uddin <baligh@google.com> 1393416283 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1393416283 -0800

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

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