- 20 Oct, 2015 40 commits
-
am 48e725bd: am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d5da3cc1 am: 7748c94d am: 4396cc1f am: a267cb6d am: f289060a am: 3b678d2e am: e147ed87 am: 83163c50 am: fa4fbc16 * commit 'fa4fbc16':
am 9ee14249: am 07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 524ed6ad am: 3f39cc45 am: 6120e609 am: d9ba2b56 am: 8dc63a93 am: b897ea77 am: f5e5e127 am: eaccb5a5 am: e3ee8154 * commit 'e3ee8154':
am 6508fe1b: am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 0274f0a5 am: cb168d34 am: 616facd7 am: 4c5dbc52 am: ed0c3623 am: bf4e852f am: 5c02e224 am: 982cbc36 am: b8ec1691 * commit 'b8ec1691':
am b3461336: (-s ours) am 853b55b9: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 5cc929ca am: 5c597e4a am: 1dda0099 am: b523cc1e am: 622880c0 am: 65f484b1 am: 7c811eca am: 9c0a25b5 am: 983daa1a * commit '983daa1a':
keep history after reset to ub-now-lunchbox-release@1069658 am: 2b8dbe3a am: 319e21ec am: ce566c0e am: 1c30b578 am: 9fa7ca7d am: dcc908e1 -s ours am: af265461 am: 9d06c95c am: 292c2f71 * commit '292c2f71':
am 48e725bd: am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d5da3cc1 am: 7748c94d am: 4396cc1f am: a267cb6d am: f289060a am: 3b678d2e am: e147ed87 am: 83163c50 * commit '83163c50':
am 9ee14249: am 07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 524ed6ad am: 3f39cc45 am: 6120e609 am: d9ba2b56 am: 8dc63a93 am: b897ea77 am: f5e5e127 am: eaccb5a5 * commit 'eaccb5a5':
am 6508fe1b: am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 0274f0a5 am: cb168d34 am: 616facd7 am: 4c5dbc52 am: ed0c3623 am: bf4e852f am: 5c02e224 am: 982cbc36 * commit '982cbc36':
am b3461336: (-s ours) am 853b55b9: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 5cc929ca am: 5c597e4a am: 1dda0099 am: b523cc1e am: 622880c0 am: 65f484b1 am: 7c811eca am: 9c0a25b5 * commit '9c0a25b5':
keep history after reset to ub-now-lunchbox-release@1069658 am: 2b8dbe3a am: 319e21ec am: ce566c0e am: 1c30b578 am: 9fa7ca7d am: dcc908e1 -s ours am: af265461 am: 9d06c95c * commit '9d06c95c':
am 48e725bd: am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d5da3cc1 am: 7748c94d am: 4396cc1f am: a267cb6d am: f289060a am: 3b678d2e am: e147ed87 * commit 'e147ed87':
am 9ee14249: am 07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 524ed6ad am: 3f39cc45 am: 6120e609 am: d9ba2b56 am: 8dc63a93 am: b897ea77 am: f5e5e127 * commit 'f5e5e127':
am 6508fe1b: am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 0274f0a5 am: cb168d34 am: 616facd7 am: 4c5dbc52 am: ed0c3623 am: bf4e852f am: 5c02e224 * commit '5c02e224':
am b3461336: (-s ours) am 853b55b9: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 5cc929ca am: 5c597e4a am: 1dda0099 am: b523cc1e am: 622880c0 am: 65f484b1 am: 7c811eca * commit '7c811eca':
am b3461336: (-s ours) am 853b55b9: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 5cc929ca am: 5c597e4a am: 1dda0099 am: b523cc1e am: 622880c0 am: 65f484b1 * commit '65f484b1':
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 8dc2ca68 am: a59ef0ba am: 8acd2748 am: 52599958 am: 1c13c137 am: d848ca48 am: 4cb42d16 am: aa27d4eb am: 96e7b9c7 * commit '96e7b9c7':
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: a2bc3772 am: b7b834bd am: ca2bafc8 am: 97742812 am: 6df4bd8b am: 7f4c5f36 am: 22c5b7f5 am: 128ffad0 am: b1f7d716 * commit 'b1f7d716':
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 6cb8ae4c am: 2feee6de am: ab3847b8 am: 0cce0579 am: 8c9ef49a am: cbdc9615 am: 1115f891 am: e1ac2ece am: 856f970b * commit '856f970b':
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 7c9f3348 am: 68c0bedd am: 59329359 am: daf2da93 am: 4cad8c77 am: 1df97e4e am: f616a8e2 am: 51755061 am: 3e5bae95 * commit '3e5bae95':
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 56ca86b7 am: 52cced3e am: 9cd759a5 am: a9d4118a am: 8020ebf7 am: df112558 am: d2688e3c am: f051b613 am: e1aa8a0a * commit 'e1aa8a0a':
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 07130d40 am: b6973a57 am: a379acb1 am: 28c9e80c am: abe2da3e am: 67e33739 am: 8d9f5bae am: 608f1ee8 am: ff6bb00b * commit 'ff6bb00b':
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d0642c42 am: 216a53f0 am: aeb301c7 am: 817bbecd am: 14861fae am: 59fcb9ce am: f882fb27 am: c314292e am: c009ae93 * commit 'c009ae93':
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 853b55b9 am: 61172868 am: 157e6c57 am: d078023b am: 5b55c46e am: 186a1a70 am: d566d24f am: b0436f29 am: dfa6fd24 * commit 'dfa6fd24':
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 9e3ebf3c am: d0726866 am: f351edd6 am: 49bc959e am: 9c3d1aee am: 319c9ac4 am: 1497b879 am: 02173b0c am: 5af66c53 * commit '5af66c53':
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release am: 381fa3fb am: f8f29b43 am: 92557c95 am: a324418e am: 8194e083 am: f4181580 am: 6dc5663a am: f5437de7 am: 3519549f * commit '3519549f':
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 8dc2ca68 am: a59ef0ba am: 8acd2748 am: 52599958 am: 1c13c137 am: d848ca48 am: 4cb42d16 am: aa27d4eb * commit 'aa27d4eb':
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: a2bc3772 am: b7b834bd am: ca2bafc8 am: 97742812 am: 6df4bd8b am: 7f4c5f36 am: 22c5b7f5 am: 128ffad0 * commit '128ffad0':
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 6cb8ae4c am: 2feee6de am: ab3847b8 am: 0cce0579 am: 8c9ef49a am: cbdc9615 am: 1115f891 am: e1ac2ece * commit 'e1ac2ece':
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 7c9f3348 am: 68c0bedd am: 59329359 am: daf2da93 am: 4cad8c77 am: 1df97e4e am: f616a8e2 am: 51755061 * commit '51755061':
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 56ca86b7 am: 52cced3e am: 9cd759a5 am: a9d4118a am: 8020ebf7 am: df112558 am: d2688e3c am: f051b613 * commit 'f051b613':
am 755dd702: Merge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop am: 84a79949 am: 313c1de1 am: 20053bc6 am: f9c3e8a6 am: cd4afe29 am: 2e1d9295 am: 855f74e9 * commit '855f74e9':
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 07130d40 am: b6973a57 am: a379acb1 am: 28c9e80c am: abe2da3e am: 67e33739 am: 8d9f5bae am: 608f1ee8 * commit '608f1ee8':
am 8cce9dd8: DO NOT MERGE Rechecking unrestored items when launcher gets created am: fdbfba88 -s ours am: 852a9656 am: 153ccdf5 am: dea24897 -s ours am: 11164db1 am: a6e267f8 am: 87122690 * commit '87122690':
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d0642c42 am: 216a53f0 am: aeb301c7 am: 817bbecd am: 14861fae am: 59fcb9ce am: f882fb27 am: c314292e * commit 'c314292e':