tree fcf23a25aadc660bd2dbb8b5178da454e8a00f08
parent 128ffad040cec0beb965ec1392d8e556c8fbad23
parent 4cb42d165f221403fa377e70dbe83ac7dabb3bfa
author Huy Nguyen <huynguyen@google.com> 1445306762 +0000
committer android-build-merger <android-build-merger@google.com> 1445306762 +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

* commit '4cb42d165f221403fa377e70dbe83ac7dabb3bfa':