tree c1733219a0653c63256bac16387d7166f723926d
parent 59329359e7530d5dee78c50b2c6c5b4993c7f02d
parent 2feee6dec261eb70a83e30fb10620b29b5a8cf54
author Huy Nguyen <huynguyen@google.com> 1445301221 +0000
committer android-build-merger <android-build-merger@google.com> 1445301221 +0000

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 6cb8ae4c16
am: 2feee6dec2

* commit '2feee6dec261eb70a83e30fb10620b29b5a8cf54':