tree d773639dfaaf0127283b4494f54a74d44a1e324a
parent dcc908e147853cf5e0552bcf387c22616f89fe16
parent 622880c0b90e91599568f00af9ed373f87dc88ed
author Adam Skory <skory@google.com> 1445304669 +0000
committer android-build-merger <android-build-merger@google.com> 1445304669 +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
am: 622880c0b9

* commit '622880c0b90e91599568f00af9ed373f87dc88ed':