tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 9fa7ca7d656039e3621385acbbfaaec2dead888d
parent b523cc1e4f258fe4bd4d1ab1f78d97daceae239e
author Adam Skory <skory@google.com> 1445303580 +0000
committer android-build-merger <android-build-merger@google.com> 1445303580 +0000

am b3461336: (-s ours) am 853b55b9: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 5cc929caa0 am: 5c597e4aba am: 1dda00996a
am: b523cc1e4f

* commit 'b523cc1e4f258fe4bd4d1ab1f78d97daceae239e':