tree 10da860fcff71886af91d082e31f0e1917926848
parent 5f4f3435824c01d980d64e3323618d209fd3ac03
parent 7c2f8b47cfb44bdb4cbdd05f081d5017a820e833
author Huy Nguyen <huynguyen@google.com> 1414566497 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566497 +0000

am 7c2f8b47: am 9e5d50c6: (-s ours) am 49635c71: (-s ours) am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release

* commit '7c2f8b47cfb44bdb4cbdd05f081d5017a820e833':