tree c1733219a0653c63256bac16387d7166f723926d
parent aeb301c7e5c7d4727b3da4b67de46bcac7d2619d
parent b6973a57c35f4ff27034b088b4778b1bcbdb404b
author Juan Silveira <jjso@google.com> 1445301210 +0000
committer android-build-merger <android-build-merger@google.com> 1445301210 +0000

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

* commit 'b6973a57c35f4ff27034b088b4778b1bcbdb404b':