tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 4cad8c7747e9d2c374eec5689f2af550e6044acd
parent 0cce0579a3630ccbaea6f8b3ad1685ec5e3c1e86
author Huy Nguyen <huynguyen@google.com> 1445303562 +0000
committer android-build-merger <android-build-merger@google.com> 1445303562 +0000

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

* commit '0cce0579a3630ccbaea6f8b3ad1685ec5e3c1e86':