tree 28ec860a4a1742fa4daa4cec08da9d2b9780418c
parent 827317adf7c0a881268cf9f86a3fb14ee7e34c4e
parent 5865f1a085af60a10eb48070bbdc8f6ff2d972fc
author Baligh Uddin <baligh@google.com> 1393416465 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1393416465 +0000

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

* commit '5865f1a085af60a10eb48070bbdc8f6ff2d972fc':
  Import translations. DO NOT MERGE