tree c1733219a0653c63256bac16387d7166f723926d
parent ce566c0e93436dd819e6910f08bf7575f20c2a19
parent 5c597e4abaec26e4fa715f93f0f7db688cc07d0d
author Adam Skory <skory@google.com> 1445301240 +0000
committer android-build-merger <android-build-merger@google.com> 1445301240 +0000

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

* commit '5c597e4abaec26e4fa715f93f0f7db688cc07d0d':