tree cba62d0d64153aa2169651696bc238591341d679
parent ae5f7ce8ed2e385cba8d65a67d9b108c9c3590e8
parent 381fa3fb2d990f7976a898c16f3675dbb325b848
author Adam Skory <skory@google.com> 1445300859 +0000
committer android-build-merger <android-build-merger@google.com> 1445300859 +0000

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release
am: 381fa3fb2d

* commit '381fa3fb2d990f7976a898c16f3675dbb325b848':