tree 82db2e21449fd52665d7cff5f67b72ea655d185f
parent 7ef659884d3152b1b499fe4c4ed4e847bc949e8c
parent 96e7b9c7594c97fe5d4a698b435d6ec9ea57dbdb
author Huy Nguyen <huynguyen@google.com> 1445310131 +0000
committer android-build-merger <android-build-merger@google.com> 1445310131 +0000

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 8dc2ca68c1 am: a59ef0ba69 am: 8acd2748b2 am: 52599958f4 am: 1c13c13722 am: d848ca4869 am: 4cb42d165f am: aa27d4ebde
am: 96e7b9c759

* commit '96e7b9c7594c97fe5d4a698b435d6ec9ea57dbdb':