tree c1733219a0653c63256bac16387d7166f723926d
parent f351edd6519615d60cb646a6976bc69caa5e7dc2
parent 61172868fde38da7f7ec8dcb84288d51095948e1
author Adam Skory <skory@google.com> 1445301201 +0000
committer android-build-merger <android-build-merger@google.com> 1445301201 +0000

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 853b55b96e
am: 61172868fd

* commit '61172868fde38da7f7ec8dcb84288d51095948e1':