tree cba62d0d64153aa2169651696bc238591341d679
parent 7118d9dd17f51d998440f257935d6670c927383f
parent 6cea6748431f5ba346cbee61f569812590fa8a46
author Mark Ashdown <ashdown@google.com> 1414098620 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414098620 +0000

am 6cea6748: (-s ours) am a4d0ef3c: (-s ours) am 7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release

* commit '6cea6748431f5ba346cbee61f569812590fa8a46':