tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 1c30b578e104035a7da6879e1722a2e99bfc11cf
parent 1dda00996a7a99d19e0edc71d5314c99806e61c1
author Adam Skory <skory@google.com> 1445302482 +0000
committer android-build-merger <android-build-merger@google.com> 1445302482 +0000

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

* commit '1dda00996a7a99d19e0edc71d5314c99806e61c1':