tree 82db2e21449fd52665d7cff5f67b72ea655d185f
parent 338bcd2bf152b38d6235d373fd4560210d6a7adc
parent 856f970b80196bfacad5d3bd878645f79a97fad4
author Huy Nguyen <huynguyen@google.com> 1445310124 +0000
committer android-build-merger <android-build-merger@google.com> 1445310124 +0000

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 6cb8ae4c16 am: 2feee6dec2 am: ab3847b8b3 am: 0cce0579a3 am: 8c9ef49ae5 am: cbdc96152e am: 1115f891dd am: e1ac2ece02
am: 856f970b80

* commit '856f970b80196bfacad5d3bd878645f79a97fad4':