tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 6df4bd8b7fc75d524c7eeb3237e9a7d76ad989d8
parent 52599958f4afef66bc0eed3c3532489857467e2c
author Huy Nguyen <huynguyen@google.com> 1445303570 +0000
committer android-build-merger <android-build-merger@google.com> 1445303570 +0000

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

* commit '52599958f4afef66bc0eed3c3532489857467e2c':