tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 9774281221d560dc61383c1d55a1aea77944485d
parent 8acd2748b24de6535e8992494831e2c03937b61b
author Huy Nguyen <huynguyen@google.com> 1445302471 +0000
committer android-build-merger <android-build-merger@google.com> 1445302471 +0000

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

* commit '8acd2748b24de6535e8992494831e2c03937b61b':