tree c1733219a0653c63256bac16387d7166f723926d
parent a379acb1cbe729b44362666bf5a9ac8f27108622
parent 52cced3edefa36f5be919f40327cef6f22d55bee
author Mathew Inwood <mathewi@google.com> 1445301213 +0000
committer android-build-merger <android-build-merger@google.com> 1445301213 +0000

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 56ca86b7c1
am: 52cced3ede

* commit '52cced3edefa36f5be919f40327cef6f22d55bee':