tree cba62d0d64153aa2169651696bc238591341d679
parent f8f29b43ff7ecf9346e12e965ee90480617525bf
parent 9e3ebf3c95fbf4b7a96b6080802ca23e5098fe40
author Adam Skory <skory@google.com> 1445300863 +0000
committer android-build-merger <android-build-merger@google.com> 1445300863 +0000

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

* commit '9e3ebf3c95fbf4b7a96b6080802ca23e5098fe40':