tree 87460bb4c9b4c8d6f51fbe8a26de347ed493653b
parent f120fe4112aa81af4c535fa0a0e4ddd928b1939a
parent fbc17c9e2f39e2d15f9bef1c4ce03b1cfb4c00e1
author Geoff Mendal <mendal@google.com> 1389900179 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389900179 -0800

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

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