tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 817bbecd42d21efe787b2bc90432f2f85edd4b28
parent a379acb1cbe729b44362666bf5a9ac8f27108622
author Juan Silveira <jjso@google.com> 1445302445 +0000
committer android-build-merger <android-build-merger@google.com> 1445302445 +0000

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 07130d400c am: b6973a57c3
am: a379acb1cb

* commit 'a379acb1cbe729b44362666bf5a9ac8f27108622':