tree c1733219a0653c63256bac16387d7166f723926d
parent ca2bafc86f947b1fe3bb3a2a21933329320d1a91
parent a59ef0ba69f7b1346616a5c6896351ad85ed9b88
author Huy Nguyen <huynguyen@google.com> 1445301229 +0000
committer android-build-merger <android-build-merger@google.com> 1445301229 +0000

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 8dc2ca68c1
am: a59ef0ba69

* commit 'a59ef0ba69f7b1346616a5c6896351ad85ed9b88':