tree cba62d0d64153aa2169651696bc238591341d679
parent 68c0bedde806eedfd25b4b726fa520c2a5c32a7a
parent 6cb8ae4c16cb3b0105ebfbb23be23e0fb1131496
author Huy Nguyen <huynguyen@google.com> 1445300895 +0000
committer android-build-merger <android-build-merger@google.com> 1445300895 +0000

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

* commit '6cb8ae4c16cb3b0105ebfbb23be23e0fb1131496':