tree cba62d0d64153aa2169651696bc238591341d679
parent d0726866694356f674ee80ca83ad97ff930bce20
parent 853b55b96e4af7a4f949a22cc084bd333e528c1c
author Adam Skory <skory@google.com> 1445300871 +0000
committer android-build-merger <android-build-merger@google.com> 1445300871 +0000

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

* commit '853b55b96e4af7a4f949a22cc084bd333e528c1c':