tree fcf23a25aadc660bd2dbb8b5178da454e8a00f08
parent 22c5b7f57d64cdcc38682cb1605a42faa6e1f104
parent d848ca4869b4f0ae1ddc0ee7abe00984d6162cc1
author Huy Nguyen <huynguyen@google.com> 1445305772 +0000
committer android-build-merger <android-build-merger@google.com> 1445305772 +0000

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

* commit 'd848ca4869b4f0ae1ddc0ee7abe00984d6162cc1':