OSDN Git Service

android-x86/packages-apps-Launcher3.git
8 years agoam 869df29e: (-s ours) am c1ac011a: (-s ours) Import translations. DO NOT MERGE am...
Baligh Uddin [Tue, 20 Oct 2015 03:26:40 +0000 (03:26 +0000)]
am 869df29e: (-s ours) am c1ac011a: (-s ours) Import translations. DO NOT MERGE am: 35424cc2a6  -s ours am: 8a901a6133  -s ours am: 6cf8795a68  -s ours am: 2d714406cd  -s ours am: ed94b5520d  -s ours am: 3e1c84ad8c  -s ours am: 4c6f47c15e  -s ours am: f4dd532c3e  -s ours
am: 9c26a98ebf  -s ours

* commit '9c26a98ebf6052cd37c90a5abeb1df8d23158905':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE am: c81b0617a6 -s ours am: 431d174f26 -s ours...
Baligh Uddin [Tue, 20 Oct 2015 03:26:36 +0000 (03:26 +0000)]
Import translations. DO NOT MERGE am: c81b0617a6  -s ours am: 431d174f26  -s ours am: 8eef658cf9  -s ours am: 1e6e698881  -s ours am: cfb6dac38f  -s ours am: 5168f039b3  -s ours am: 83e41764c1  -s ours am: e0342fad73  -s ours
am: 10873a6d78  -s ours

* commit '10873a6d7828c8204b0397198c6e5d4c0d044ed1':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE am: 81403969d1 -s ours am: bbe424e584 -s ours...
Baligh Uddin [Tue, 20 Oct 2015 03:26:33 +0000 (03:26 +0000)]
Import translations. DO NOT MERGE am: 81403969d1  -s ours am: bbe424e584  -s ours am: 5b53a47d02  -s ours am: 9b7386403a  -s ours am: 994502244e  -s ours am: 2573cb9c33  -s ours am: 1e52e4df04  -s ours am: 0df33c9132  -s ours
am: 83e8ec10d8  -s ours

* commit '83e8ec10d830e3d6d3ebe6b7a4dda7b25c0a4a6d':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE am: 01614d6ba5 -s ours am: 8454595cf3 -s ours...
Baligh Uddin [Tue, 20 Oct 2015 03:26:29 +0000 (03:26 +0000)]
Import translations. DO NOT MERGE am: 01614d6ba5  -s ours am: 8454595cf3  -s ours am: 3f3f0fbc02  -s ours am: 2693dd2cd9  -s ours am: 1edcac1745  -s ours am: dc4f328c4d  -s ours am: 7cdd35ca3c  -s ours am: 03612b0a04  -s ours
am: 188a1c0d1a  -s ours

* commit '188a1c0d1a545254e190e2fc6e09a77f54db1a4f':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE am: c4d66cf035 -s ours am: 3209b2bc4d -s ours...
Baligh Uddin [Tue, 20 Oct 2015 03:26:26 +0000 (03:26 +0000)]
Import translations. DO NOT MERGE am: c4d66cf035  -s ours am: 3209b2bc4d  -s ours am: 69830841ec  -s ours am: 4baaf3241f  -s ours am: 5148e0d456  -s ours am: 21abe0d9f7  -s ours am: 9c2588976f  -s ours am: d487fcd435  -s ours
am: f072358f7e  -s ours

* commit 'f072358f7ed09e032e908564f636472e4af1e3be':
  Import translations. DO NOT MERGE

8 years agoam ddaac40d: am aebea1b0: keep history after reset to ub-now-lunchbox-release@1069658...
Baligh Uddin [Tue, 20 Oct 2015 03:26:22 +0000 (03:26 +0000)]
am ddaac40d: am aebea1b0: keep history after reset to ub-now-lunchbox-release@1069658 am: 7fd445f4cc am: 5d6886a1cf am: 38bd557502 am: 0442deaee7 am: 5793b647fd am: f351d2d274 am: cf067a9a44 am: 4d31a0b5f1
am: 4075264811

* commit '4075264811ee4118662cc39c0895cb6647fb75f8':

8 years agoam e35f8e2c: am 8dc2ca68: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into...
Huy Nguyen [Tue, 20 Oct 2015 03:26:18 +0000 (03:26 +0000)]
am e35f8e2c: am 8dc2ca68: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 149268d869 am: 70aa099f23 am: eadf9b6782 am: 24483f0498 am: a107ef6e13 am: f7f8df9f7c am: 94fd0e00d1 am: 12a5698507
am: b8b5e8d796

* commit 'b8b5e8d7967e4f69a64b952e08d489cef0cf51dc':

8 years agoam 32e4344a: am a2bc3772: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into...
Mark Ashdown [Tue, 20 Oct 2015 03:26:15 +0000 (03:26 +0000)]
am 32e4344a: am a2bc3772: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: b1a081221e am: 1bd8f7e460 am: 7661d33379 am: 7e5ec74df0 am: 84138b1523 am: e90e2b89bb am: 26e7cd5b94 am: 29adb8de49
am: 76494fd9a0

* commit '76494fd9a0e146bc2045c8ed2bc92290ac6a5b64':

8 years agoam 49635c71: am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into...
Huy Nguyen [Tue, 20 Oct 2015 03:26:11 +0000 (03:26 +0000)]
am 49635c71: am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: fb1a32a63d am: 27b99c86e9 am: 078afac399 am: 94b7ee378f am: 6b7a1631f6 am: 753cf130b9 am: bbf5c27346 am: 63251de093
am: 18cd7c97b8

* commit '18cd7c97b8ca5abc1462c015c08d6f8fc1736382':

8 years agoam a4d0ef3c: am 7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into...
Mark Ashdown [Tue, 20 Oct 2015 03:26:07 +0000 (03:26 +0000)]
am a4d0ef3c: am 7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 64b83ce632 am: 346da07c80 am: 78a44d4726 am: 8abc959461 am: 6060c10580 am: 9d494757cf am: daf82e6d8c am: d8b2144af4
am: 387a4ffab2

* commit '387a4ffab269f252708c3c1a9017b29a10e422b8':

8 years agoam 48e725bd: am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into...
Mathew Inwood [Tue, 20 Oct 2015 03:26:04 +0000 (03:26 +0000)]
am 48e725bd: am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d5da3cc1d8 am: 7748c94d25 am: 4396cc1fff am: a267cb6dde am: f289060a04 am: 3b678d2e58 am: e147ed8705 am: 83163c5011
am: fa4fbc1653

* commit 'fa4fbc1653b46c7a33e82672b6fdaced0993faa8':

8 years agoam 9ee14249: am 07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into...
Juan Silveira [Tue, 20 Oct 2015 03:26:00 +0000 (03:26 +0000)]
am 9ee14249: am 07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 524ed6adda am: 3f39cc45d8 am: 6120e6096a am: d9ba2b56db am: 8dc63a93c6 am: b897ea777e am: f5e5e1270d am: eaccb5a5b4
am: e3ee81540c

* commit 'e3ee81540cc0cf77a4c92395433049edd340d5d6':

8 years agoam 6508fe1b: am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into...
Anton Hansson [Tue, 20 Oct 2015 03:25:57 +0000 (03:25 +0000)]
am 6508fe1b: am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 0274f0a568 am: cb168d34ae am: 616facd74b am: 4c5dbc52b3 am: ed0c3623a9 am: bf4e852f95 am: 5c02e22455 am: 982cbc361c
am: b8ec169116

* commit 'b8ec169116e9fff236ff17bb515ebd076f0dbb64':

8 years agoam b3461336: (-s ours) am 853b55b9: Merge remote-tracking branch \'goog/ub-now-lunchb...
Adam Skory [Tue, 20 Oct 2015 03:25:53 +0000 (03:25 +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 am: 65f484b1fc am: 7c811ecaaf am: 9c0a25b58c
am: 983daa1abc

* commit '983daa1abc163de0258ee8a0aad133dfe7ec4b5e':

8 years agokeep history after reset to ub-now-lunchbox-release@1069658 am: 2b8dbe3a5f am: 319e21...
Baligh Uddin [Tue, 20 Oct 2015 03:25:50 +0000 (03:25 +0000)]
keep history after reset to ub-now-lunchbox-release@1069658 am: 2b8dbe3a5f am: 319e21ec62 am: ce566c0e93 am: 1c30b578e1 am: 9fa7ca7d65 am: dcc908e147  -s ours am: af265461f1 am: 9d06c95c57
am: 292c2f7174

* commit '292c2f71744350048a9a1ddea96bb4e12b6a1d03':

8 years agoam 869df29e: (-s ours) am c1ac011a: (-s ours) Import translations. DO NOT MERGE am...
Baligh Uddin [Tue, 20 Oct 2015 03:24:38 +0000 (03:24 +0000)]
am 869df29e: (-s ours) am c1ac011a: (-s ours) Import translations. DO NOT MERGE am: 35424cc2a6  -s ours am: 8a901a6133  -s ours am: 6cf8795a68  -s ours am: 2d714406cd  -s ours am: ed94b5520d  -s ours am: 3e1c84ad8c  -s ours am: 4c6f47c15e  -s ours
am: f4dd532c3e  -s ours

* commit 'f4dd532c3e8d63805482cfb911cd2d50454a0837':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE am: c81b0617a6 -s ours am: 431d174f26 -s ours...
Baligh Uddin [Tue, 20 Oct 2015 03:24:34 +0000 (03:24 +0000)]
Import translations. DO NOT MERGE am: c81b0617a6  -s ours am: 431d174f26  -s ours am: 8eef658cf9  -s ours am: 1e6e698881  -s ours am: cfb6dac38f  -s ours am: 5168f039b3  -s ours am: 83e41764c1  -s ours
am: e0342fad73  -s ours

* commit 'e0342fad73f011b65ee566a652ba556566f3533b':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE am: 81403969d1 -s ours am: bbe424e584 -s ours...
Baligh Uddin [Tue, 20 Oct 2015 03:24:30 +0000 (03:24 +0000)]
Import translations. DO NOT MERGE am: 81403969d1  -s ours am: bbe424e584  -s ours am: 5b53a47d02  -s ours am: 9b7386403a  -s ours am: 994502244e  -s ours am: 2573cb9c33  -s ours am: 1e52e4df04  -s ours
am: 0df33c9132  -s ours

* commit '0df33c9132542f746cc13e6cf4d30f80810cdee5':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE am: 01614d6ba5 -s ours am: 8454595cf3 -s ours...
Baligh Uddin [Tue, 20 Oct 2015 03:24:26 +0000 (03:24 +0000)]
Import translations. DO NOT MERGE am: 01614d6ba5  -s ours am: 8454595cf3  -s ours am: 3f3f0fbc02  -s ours am: 2693dd2cd9  -s ours am: 1edcac1745  -s ours am: dc4f328c4d  -s ours am: 7cdd35ca3c  -s ours
am: 03612b0a04  -s ours

* commit '03612b0a04f68638f7b6ab075f1af430ca707aee':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE am: c4d66cf035 -s ours am: 3209b2bc4d -s ours...
Baligh Uddin [Tue, 20 Oct 2015 03:24:21 +0000 (03:24 +0000)]
Import translations. DO NOT MERGE am: c4d66cf035  -s ours am: 3209b2bc4d  -s ours am: 69830841ec  -s ours am: 4baaf3241f  -s ours am: 5148e0d456  -s ours am: 21abe0d9f7  -s ours am: 9c2588976f  -s ours
am: d487fcd435  -s ours

* commit 'd487fcd4354007dc0a9ad1f4b9f94e557b268d80':
  Import translations. DO NOT MERGE

8 years agoam ddaac40d: am aebea1b0: keep history after reset to ub-now-lunchbox-release@1069658...
Baligh Uddin [Tue, 20 Oct 2015 03:24:08 +0000 (03:24 +0000)]
am ddaac40d: am aebea1b0: keep history after reset to ub-now-lunchbox-release@1069658 am: 7fd445f4cc am: 5d6886a1cf am: 38bd557502 am: 0442deaee7 am: 5793b647fd am: f351d2d274 am: cf067a9a44
am: 4d31a0b5f1

* commit '4d31a0b5f1a2421a32581397c88b51e57ddfcf9d':

8 years agoam e35f8e2c: am 8dc2ca68: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into...
Huy Nguyen [Tue, 20 Oct 2015 03:24:01 +0000 (03:24 +0000)]
am e35f8e2c: am 8dc2ca68: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 149268d869 am: 70aa099f23 am: eadf9b6782 am: 24483f0498 am: a107ef6e13 am: f7f8df9f7c am: 94fd0e00d1
am: 12a5698507

* commit '12a5698507f2a31384ec243f0eb54576acec5ea9':

8 years agoam 32e4344a: am a2bc3772: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into...
Mark Ashdown [Tue, 20 Oct 2015 03:23:58 +0000 (03:23 +0000)]
am 32e4344a: am a2bc3772: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: b1a081221e am: 1bd8f7e460 am: 7661d33379 am: 7e5ec74df0 am: 84138b1523 am: e90e2b89bb am: 26e7cd5b94
am: 29adb8de49

* commit '29adb8de4972dba97896ffb4e890f66ad1aa164a':

8 years agoam 49635c71: am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into...
Huy Nguyen [Tue, 20 Oct 2015 03:23:56 +0000 (03:23 +0000)]
am 49635c71: am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: fb1a32a63d am: 27b99c86e9 am: 078afac399 am: 94b7ee378f am: 6b7a1631f6 am: 753cf130b9 am: bbf5c27346
am: 63251de093

* commit '63251de0934b39d2dc871d3d3fee9d5998289130':

8 years agoam a4d0ef3c: am 7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into...
Mark Ashdown [Tue, 20 Oct 2015 03:23:51 +0000 (03:23 +0000)]
am a4d0ef3c: am 7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 64b83ce632 am: 346da07c80 am: 78a44d4726 am: 8abc959461 am: 6060c10580 am: 9d494757cf am: daf82e6d8c
am: d8b2144af4

* commit 'd8b2144af4d59646d744b8d802e2a2b11008019f':

8 years agoam 48e725bd: am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into...
Mathew Inwood [Tue, 20 Oct 2015 03:23:45 +0000 (03:23 +0000)]
am 48e725bd: am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d5da3cc1d8 am: 7748c94d25 am: 4396cc1fff am: a267cb6dde am: f289060a04 am: 3b678d2e58 am: e147ed8705
am: 83163c5011

* commit '83163c501180a7f970a3501e8c3e07cf56705a7d':

8 years agoam 9ee14249: am 07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into...
Juan Silveira [Tue, 20 Oct 2015 03:23:40 +0000 (03:23 +0000)]
am 9ee14249: am 07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 524ed6adda am: 3f39cc45d8 am: 6120e6096a am: d9ba2b56db am: 8dc63a93c6 am: b897ea777e am: f5e5e1270d
am: eaccb5a5b4

* commit 'eaccb5a5b4eb8724833e78ad545c8eb68a4e6bd2':

8 years agoam 6508fe1b: am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into...
Anton Hansson [Tue, 20 Oct 2015 03:23:33 +0000 (03:23 +0000)]
am 6508fe1b: am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 0274f0a568 am: cb168d34ae am: 616facd74b am: 4c5dbc52b3 am: ed0c3623a9 am: bf4e852f95 am: 5c02e22455
am: 982cbc361c

* commit '982cbc361cf5d7104a5ab046550112c9eb569004':

8 years agoam b3461336: (-s ours) am 853b55b9: Merge remote-tracking branch \'goog/ub-now-lunchb...
Adam Skory [Tue, 20 Oct 2015 03:23:26 +0000 (03:23 +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 am: 65f484b1fc am: 7c811ecaaf
am: 9c0a25b58c

* commit '9c0a25b58c0f1f620d57ecae170e5fb5e442fb41':

8 years agokeep history after reset to ub-now-lunchbox-release@1069658 am: 2b8dbe3a5f am: 319e21...
Baligh Uddin [Tue, 20 Oct 2015 03:23:19 +0000 (03:23 +0000)]
keep history after reset to ub-now-lunchbox-release@1069658 am: 2b8dbe3a5f am: 319e21ec62 am: ce566c0e93 am: 1c30b578e1 am: 9fa7ca7d65 am: dcc908e147  -s ours am: af265461f1
am: 9d06c95c57

* commit '9d06c95c575248043e64821568a30131926f18b1':

8 years agoam 869df29e: (-s ours) am c1ac011a: (-s ours) Import translations. DO NOT MERGE am...
Baligh Uddin [Tue, 20 Oct 2015 03:22:17 +0000 (03:22 +0000)]
am 869df29e: (-s ours) am c1ac011a: (-s ours) Import translations. DO NOT MERGE am: 35424cc2a6  -s ours am: 8a901a6133  -s ours am: 6cf8795a68  -s ours am: 2d714406cd  -s ours am: ed94b5520d  -s ours am: 3e1c84ad8c  -s ours
am: 4c6f47c15e  -s ours

* commit '4c6f47c15eb13f297be5d19423eebb6f1b683b11':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE am: c81b0617a6 -s ours am: 431d174f26 -s ours...
Baligh Uddin [Tue, 20 Oct 2015 03:22:13 +0000 (03:22 +0000)]
Import translations. DO NOT MERGE am: c81b0617a6  -s ours am: 431d174f26  -s ours am: 8eef658cf9  -s ours am: 1e6e698881  -s ours am: cfb6dac38f  -s ours am: 5168f039b3  -s ours
am: 83e41764c1  -s ours

* commit '83e41764c19e5b2e1ef00b7bed6a1f8f7bca2b1e':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE am: 81403969d1 -s ours am: bbe424e584 -s ours...
Baligh Uddin [Tue, 20 Oct 2015 03:22:08 +0000 (03:22 +0000)]
Import translations. DO NOT MERGE am: 81403969d1  -s ours am: bbe424e584  -s ours am: 5b53a47d02  -s ours am: 9b7386403a  -s ours am: 994502244e  -s ours am: 2573cb9c33  -s ours
am: 1e52e4df04  -s ours

* commit '1e52e4df0461dd9453a732527bfbadf4cea34441':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE am: 01614d6ba5 -s ours am: 8454595cf3 -s ours...
Baligh Uddin [Tue, 20 Oct 2015 03:22:04 +0000 (03:22 +0000)]
Import translations. DO NOT MERGE am: 01614d6ba5  -s ours am: 8454595cf3  -s ours am: 3f3f0fbc02  -s ours am: 2693dd2cd9  -s ours am: 1edcac1745  -s ours am: dc4f328c4d  -s ours
am: 7cdd35ca3c  -s ours

* commit '7cdd35ca3c444b1c532620893754d68bf502f851':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE am: c4d66cf035 -s ours am: 3209b2bc4d -s ours...
Baligh Uddin [Tue, 20 Oct 2015 03:22:00 +0000 (03:22 +0000)]
Import translations. DO NOT MERGE am: c4d66cf035  -s ours am: 3209b2bc4d  -s ours am: 69830841ec  -s ours am: 4baaf3241f  -s ours am: 5148e0d456  -s ours am: 21abe0d9f7  -s ours
am: 9c2588976f  -s ours

* commit '9c2588976f49c7183b844658fc7e5319230977bf':
  Import translations. DO NOT MERGE

8 years agoam ddaac40d: am aebea1b0: keep history after reset to ub-now-lunchbox-release@1069658...
Baligh Uddin [Tue, 20 Oct 2015 03:21:56 +0000 (03:21 +0000)]
am ddaac40d: am aebea1b0: keep history after reset to ub-now-lunchbox-release@1069658 am: 7fd445f4cc am: 5d6886a1cf am: 38bd557502 am: 0442deaee7 am: 5793b647fd am: f351d2d274
am: cf067a9a44

* commit 'cf067a9a44f00315d11c72432602fb8b9e03cf73':

8 years agoam e35f8e2c: am 8dc2ca68: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into...
Huy Nguyen [Tue, 20 Oct 2015 03:21:53 +0000 (03:21 +0000)]
am e35f8e2c: am 8dc2ca68: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 149268d869 am: 70aa099f23 am: eadf9b6782 am: 24483f0498 am: a107ef6e13 am: f7f8df9f7c
am: 94fd0e00d1

* commit '94fd0e00d115fb60eba1cfbf94e72fb841188587':

8 years agoam 32e4344a: am a2bc3772: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into...
Mark Ashdown [Tue, 20 Oct 2015 03:21:48 +0000 (03:21 +0000)]
am 32e4344a: am a2bc3772: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: b1a081221e am: 1bd8f7e460 am: 7661d33379 am: 7e5ec74df0 am: 84138b1523 am: e90e2b89bb
am: 26e7cd5b94

* commit '26e7cd5b94130811fd5557174b8ed023780d429e':

8 years agoam 49635c71: am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into...
Huy Nguyen [Tue, 20 Oct 2015 03:21:45 +0000 (03:21 +0000)]
am 49635c71: am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: fb1a32a63d am: 27b99c86e9 am: 078afac399 am: 94b7ee378f am: 6b7a1631f6 am: 753cf130b9
am: bbf5c27346

* commit 'bbf5c273465e266ab26f02110f54991f4850af30':

8 years agoam a4d0ef3c: am 7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into...
Mark Ashdown [Tue, 20 Oct 2015 03:21:39 +0000 (03:21 +0000)]
am a4d0ef3c: am 7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 64b83ce632 am: 346da07c80 am: 78a44d4726 am: 8abc959461 am: 6060c10580 am: 9d494757cf
am: daf82e6d8c

* commit 'daf82e6d8c35b1b09dfce13998eb77ddb7840622':

8 years agoam 48e725bd: am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into...
Mathew Inwood [Tue, 20 Oct 2015 03:21:35 +0000 (03:21 +0000)]
am 48e725bd: am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d5da3cc1d8 am: 7748c94d25 am: 4396cc1fff am: a267cb6dde am: f289060a04 am: 3b678d2e58
am: e147ed8705

* commit 'e147ed87056f616c4798eb243615f6f9de5380e9':

8 years agoam 9ee14249: am 07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into...
Juan Silveira [Tue, 20 Oct 2015 03:21:31 +0000 (03:21 +0000)]
am 9ee14249: am 07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 524ed6adda am: 3f39cc45d8 am: 6120e6096a am: d9ba2b56db am: 8dc63a93c6 am: b897ea777e
am: f5e5e1270d

* commit 'f5e5e1270d7186ccbca50a8515145d01c5cf2689':

8 years agoam 6508fe1b: am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into...
Anton Hansson [Tue, 20 Oct 2015 03:21:28 +0000 (03:21 +0000)]
am 6508fe1b: am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 0274f0a568 am: cb168d34ae am: 616facd74b am: 4c5dbc52b3 am: ed0c3623a9 am: bf4e852f95
am: 5c02e22455

* commit '5c02e224552e9df198bd49b4c82906c6078999a2':

8 years agoam b3461336: (-s ours) am 853b55b9: Merge remote-tracking branch \'goog/ub-now-lunchb...
Adam Skory [Tue, 20 Oct 2015 03:21:23 +0000 (03:21 +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 am: 65f484b1fc
am: 7c811ecaaf

* commit '7c811ecaaf91dc102e45d9055e91270d04140c29':

8 years agokeep history after reset to ub-now-lunchbox-release@1069658 am: 2b8dbe3a5f am: 319e21...
Baligh Uddin [Tue, 20 Oct 2015 03:21:19 +0000 (03:21 +0000)]
keep history after reset to ub-now-lunchbox-release@1069658 am: 2b8dbe3a5f am: 319e21ec62 am: ce566c0e93 am: 1c30b578e1 am: 9fa7ca7d65 am: dcc908e147  -s ours
am: af265461f1

* commit 'af265461f1c56e3a7adc42f34032f45b8522722a':

8 years agoam 869df29e: (-s ours) am c1ac011a: (-s ours) Import translations. DO NOT MERGE am...
Baligh Uddin [Tue, 20 Oct 2015 03:19:47 +0000 (03:19 +0000)]
am 869df29e: (-s ours) am c1ac011a: (-s ours) Import translations. DO NOT MERGE am: 35424cc2a6  -s ours am: 8a901a6133  -s ours am: 6cf8795a68  -s ours am: 2d714406cd  -s ours am: ed94b5520d  -s ours
am: 3e1c84ad8c  -s ours

* commit '3e1c84ad8cecb69a3b417eced3ae6fbe219cc520':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE am: c81b0617a6 -s ours am: 431d174f26 -s ours...
Baligh Uddin [Tue, 20 Oct 2015 03:19:44 +0000 (03:19 +0000)]
Import translations. DO NOT MERGE am: c81b0617a6  -s ours am: 431d174f26  -s ours am: 8eef658cf9  -s ours am: 1e6e698881  -s ours am: cfb6dac38f  -s ours
am: 5168f039b3  -s ours

* commit '5168f039b3befcbf9fcd2f5b0ed316af10fb5acb':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE am: 81403969d1 -s ours am: bbe424e584 -s ours...
Baligh Uddin [Tue, 20 Oct 2015 03:19:41 +0000 (03:19 +0000)]
Import translations. DO NOT MERGE am: 81403969d1  -s ours am: bbe424e584  -s ours am: 5b53a47d02  -s ours am: 9b7386403a  -s ours am: 994502244e  -s ours
am: 2573cb9c33  -s ours

* commit '2573cb9c33f4a1009635baec48cc3ddf4b42df09':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE am: 01614d6ba5 -s ours am: 8454595cf3 -s ours...
Baligh Uddin [Tue, 20 Oct 2015 03:19:38 +0000 (03:19 +0000)]
Import translations. DO NOT MERGE am: 01614d6ba5  -s ours am: 8454595cf3  -s ours am: 3f3f0fbc02  -s ours am: 2693dd2cd9  -s ours am: 1edcac1745  -s ours
am: dc4f328c4d  -s ours

* commit 'dc4f328c4d90a36287c5b4f3137ead7e5d0efee7':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE am: c4d66cf035 -s ours am: 3209b2bc4d -s ours...
Baligh Uddin [Tue, 20 Oct 2015 03:19:35 +0000 (03:19 +0000)]
Import translations. DO NOT MERGE am: c4d66cf035  -s ours am: 3209b2bc4d  -s ours am: 69830841ec  -s ours am: 4baaf3241f  -s ours am: 5148e0d456  -s ours
am: 21abe0d9f7  -s ours

* commit '21abe0d9f7f65cb45e87845cb8e6b84c1260b7ea':
  Import translations. DO NOT MERGE

8 years agoam ddaac40d: am aebea1b0: keep history after reset to ub-now-lunchbox-release@1069658...
Baligh Uddin [Tue, 20 Oct 2015 03:19:32 +0000 (03:19 +0000)]
am ddaac40d: am aebea1b0: keep history after reset to ub-now-lunchbox-release@1069658 am: 7fd445f4cc am: 5d6886a1cf am: 38bd557502 am: 0442deaee7 am: 5793b647fd
am: f351d2d274

* commit 'f351d2d274ec47bff368fa91b157739c399cda5d':

8 years agoam e35f8e2c: am 8dc2ca68: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into...
Huy Nguyen [Tue, 20 Oct 2015 03:19:28 +0000 (03:19 +0000)]
am e35f8e2c: am 8dc2ca68: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 149268d869 am: 70aa099f23 am: eadf9b6782 am: 24483f0498 am: a107ef6e13
am: f7f8df9f7c

* commit 'f7f8df9f7c11210c412c07106032c25618911746':

8 years agoam 32e4344a: am a2bc3772: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into...
Mark Ashdown [Tue, 20 Oct 2015 03:19:25 +0000 (03:19 +0000)]
am 32e4344a: am a2bc3772: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: b1a081221e am: 1bd8f7e460 am: 7661d33379 am: 7e5ec74df0 am: 84138b1523
am: e90e2b89bb

* commit 'e90e2b89bb19f8eff4a878816c4501094bb18048':

8 years agoam 49635c71: am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into...
Huy Nguyen [Tue, 20 Oct 2015 03:19:22 +0000 (03:19 +0000)]
am 49635c71: am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: fb1a32a63d am: 27b99c86e9 am: 078afac399 am: 94b7ee378f am: 6b7a1631f6
am: 753cf130b9

* commit '753cf130b9e1e1b840a4aead09a00f31011bb55f':

8 years agoam a4d0ef3c: am 7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into...
Mark Ashdown [Tue, 20 Oct 2015 03:19:19 +0000 (03:19 +0000)]
am a4d0ef3c: am 7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 64b83ce632 am: 346da07c80 am: 78a44d4726 am: 8abc959461 am: 6060c10580
am: 9d494757cf

* commit '9d494757cfb8b7ecc9766425d787661857506bb2':

8 years agoam 48e725bd: am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into...
Mathew Inwood [Tue, 20 Oct 2015 03:19:16 +0000 (03:19 +0000)]
am 48e725bd: am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d5da3cc1d8 am: 7748c94d25 am: 4396cc1fff am: a267cb6dde am: f289060a04
am: 3b678d2e58

* commit '3b678d2e58d57e05bcb1d6c9213dadcffec1a181':

8 years agoam 9ee14249: am 07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into...
Juan Silveira [Tue, 20 Oct 2015 03:19:13 +0000 (03:19 +0000)]
am 9ee14249: am 07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 524ed6adda am: 3f39cc45d8 am: 6120e6096a am: d9ba2b56db am: 8dc63a93c6
am: b897ea777e

* commit 'b897ea777eb4b889122a5f2f9604f36ef6ee182f':

8 years agoam 6508fe1b: am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into...
Anton Hansson [Tue, 20 Oct 2015 03:19:10 +0000 (03:19 +0000)]
am 6508fe1b: am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 0274f0a568 am: cb168d34ae am: 616facd74b am: 4c5dbc52b3 am: ed0c3623a9
am: bf4e852f95

* commit 'bf4e852f95d430bcea11e903337ddae07c013572':

8 years agoam b3461336: (-s ours) am 853b55b9: Merge remote-tracking branch \'goog/ub-now-lunchb...
Adam Skory [Tue, 20 Oct 2015 03:19:06 +0000 (03:19 +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
am: 65f484b1fc

* commit '65f484b1fc2c0a7b41478fabf5a0321443df7ab8':

8 years agokeep history after reset to ub-now-lunchbox-release@1069658 am: 2b8dbe3a5f am: 319e21...
Baligh Uddin [Tue, 20 Oct 2015 03:19:03 +0000 (03:19 +0000)]
keep history after reset to ub-now-lunchbox-release@1069658 am: 2b8dbe3a5f am: 319e21ec62 am: ce566c0e93 am: 1c30b578e1 am: 9fa7ca7d65
am: dcc908e147  -s ours

* commit 'dcc908e147853cf5e0552bcf387c22616f89fe16':

8 years agoMerge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 8dc2c...
Huy Nguyen [Tue, 20 Oct 2015 03:02:11 +0000 (03:02 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 8dc2ca68c1 am: a59ef0ba69 am: 8acd2748b2 am: 52599958f4 am: 1c13c13722 am: d848ca4869 am: 4cb42d165f am: aa27d4ebde
am: 96e7b9c759

* commit '96e7b9c7594c97fe5d4a698b435d6ec9ea57dbdb':

8 years agoMerge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: a2bc3...
Mark Ashdown [Tue, 20 Oct 2015 03:02:07 +0000 (03:02 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: a2bc37722e am: b7b834bde1 am: ca2bafc86f am: 9774281221 am: 6df4bd8b7f am: 7f4c5f364f am: 22c5b7f57d am: 128ffad040
am: b1f7d716f6

* commit 'b1f7d716f69fb2eab670ffdb2ae74c5818e4d536':

8 years agoMerge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 6cb8a...
Huy Nguyen [Tue, 20 Oct 2015 03:02:04 +0000 (03:02 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 6cb8ae4c16 am: 2feee6dec2 am: ab3847b8b3 am: 0cce0579a3 am: 8c9ef49ae5 am: cbdc96152e am: 1115f891dd am: e1ac2ece02
am: 856f970b80

* commit '856f970b80196bfacad5d3bd878645f79a97fad4':

8 years agoMerge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 7c9f3...
Mark Ashdown [Tue, 20 Oct 2015 03:02:00 +0000 (03:02 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 7c9f33481f am: 68c0bedde8 am: 59329359e7 am: daf2da93f6 am: 4cad8c7747 am: 1df97e4e4b am: f616a8e2d1 am: 5175506151
am: 3e5bae9519

* commit '3e5bae9519d4e9312ff7a4561a1ab47b7623376f':

8 years agoMerge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 56ca8...
Mathew Inwood [Tue, 20 Oct 2015 03:01:56 +0000 (03:01 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 56ca86b7c1 am: 52cced3ede am: 9cd759a5e1 am: a9d4118ab3 am: 8020ebf7bc am: df112558f3 am: d2688e3c3a am: f051b6136b
am: e1aa8a0a91

* commit 'e1aa8a0a91b1981e3e1bee74c0aadc75a0491dfb':

8 years agoMerge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 07130...
Juan Silveira [Tue, 20 Oct 2015 03:01:52 +0000 (03:01 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 07130d400c am: b6973a57c3 am: a379acb1cb am: 28c9e80cc0 am: abe2da3ed1 am: 67e3373948 am: 8d9f5baea1 am: 608f1ee85e
am: ff6bb00bf5

* commit 'ff6bb00bf57440dccf16529dd8b0efe0f97d0edf':

8 years agoMerge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d0642...
Anton Hansson [Tue, 20 Oct 2015 03:01:48 +0000 (03:01 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d0642c4274 am: 216a53f0b1 am: aeb301c7e5 am: 817bbecd42 am: 14861fae4d am: 59fcb9ce40 am: f882fb27b7 am: c314292efc
am: c009ae9374

* commit 'c009ae93749d80797cb256149c1a275c6fcac369':

8 years agoMerge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 853b5...
Adam Skory [Tue, 20 Oct 2015 03:01:45 +0000 (03:01 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 853b55b96e am: 61172868fd am: 157e6c57d6 am: d078023bce am: 5b55c46e01 am: 186a1a7060 am: d566d24f65 am: b0436f294f
am: dfa6fd246a

* commit 'dfa6fd246aeb0430729c69dd1689b6c014950f0c':

8 years agoMerge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 9e3eb...
Adam Skory [Tue, 20 Oct 2015 03:01:41 +0000 (03:01 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 9e3ebf3c95 am: d072686669 am: f351edd651 am: 49bc959e07 am: 9c3d1aee2f am: 319c9ac41f am: 1497b879e4 am: 02173b0c65
am: 5af66c53bf

* commit '5af66c53bf800684b41cd7cf6c6eab6566ee46e9':

8 years agoMerge remote-tracking branch \'goog/ub-now-lunchbox\' into release am: 381fa3fb2d...
Adam Skory [Tue, 20 Oct 2015 03:01:37 +0000 (03:01 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release am: 381fa3fb2d am: f8f29b43ff am: 92557c9596 am: a324418ece am: 8194e08397 am: f41815802e am: 6dc5663ab3 am: f5437de749
am: 3519549f36

* commit '3519549f36985b84ccf4e2b5ec41879c89f4d058':

8 years agoMerge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 8dc2c...
Huy Nguyen [Tue, 20 Oct 2015 02:24:16 +0000 (02:24 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 8dc2ca68c1 am: a59ef0ba69 am: 8acd2748b2 am: 52599958f4 am: 1c13c13722 am: d848ca4869 am: 4cb42d165f
am: aa27d4ebde

* commit 'aa27d4ebde868c000b336df8066ca791fbb1cd75':

8 years agoMerge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: a2bc3...
Mark Ashdown [Tue, 20 Oct 2015 02:24:13 +0000 (02:24 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: a2bc37722e am: b7b834bde1 am: ca2bafc86f am: 9774281221 am: 6df4bd8b7f am: 7f4c5f364f am: 22c5b7f57d
am: 128ffad040

* commit '128ffad040cec0beb965ec1392d8e556c8fbad23':

8 years agoMerge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 6cb8a...
Huy Nguyen [Tue, 20 Oct 2015 02:24:09 +0000 (02:24 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 6cb8ae4c16 am: 2feee6dec2 am: ab3847b8b3 am: 0cce0579a3 am: 8c9ef49ae5 am: cbdc96152e am: 1115f891dd
am: e1ac2ece02

* commit 'e1ac2ece027431e995b44d379cd03f636c95fb9c':

8 years agoMerge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 7c9f3...
Mark Ashdown [Tue, 20 Oct 2015 02:24:04 +0000 (02:24 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 7c9f33481f am: 68c0bedde8 am: 59329359e7 am: daf2da93f6 am: 4cad8c7747 am: 1df97e4e4b am: f616a8e2d1
am: 5175506151

* commit '5175506151c4b21798336120b84ef60b136091a1':

8 years agoMerge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 56ca8...
Mathew Inwood [Tue, 20 Oct 2015 02:23:58 +0000 (02:23 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 56ca86b7c1 am: 52cced3ede am: 9cd759a5e1 am: a9d4118ab3 am: 8020ebf7bc am: df112558f3 am: d2688e3c3a
am: f051b6136b

* commit 'f051b6136bc930609ef5053d24191f3b3f2b509b':

8 years agoam ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop am: e7afa51bd8...
Adam Cohen [Tue, 20 Oct 2015 02:23:58 +0000 (02:23 +0000)]
am ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop am: e7afa51bd8 am: 6d0a93207e am: a5eae84cbf am: e4eadaaf37 am: 58de3e8c64 am: b161e4e46e
am: 1f7673be44

* commit '1f7673be44a16106a5db62f1c845e1b6aed6ae7e':

8 years agoam 755dd702: Merge "Fix missing screen when adding widget directly to provider" into...
Adam Cohen [Tue, 20 Oct 2015 02:23:55 +0000 (02:23 +0000)]
am 755dd702: Merge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop am: 84a79949a4 am: 313c1de1cc am: 20053bc691 am: f9c3e8a6ae am: cd4afe29cb am: 2e1d9295f5
am: 855f74e976

* commit '855f74e97619dc07db0fcaa7e7b49e28ebff1117':

8 years agoMerge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 07130...
Juan Silveira [Tue, 20 Oct 2015 02:23:54 +0000 (02:23 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 07130d400c am: b6973a57c3 am: a379acb1cb am: 28c9e80cc0 am: abe2da3ed1 am: 67e3373948 am: 8d9f5baea1
am: 608f1ee85e

* commit '608f1ee85e8b80710b3c60119480dd1241eed9a9':

8 years agoam 8cce9dd8: DO NOT MERGE Rechecking unrestored items when launcher gets created...
Sunny Goyal [Tue, 20 Oct 2015 02:23:52 +0000 (02:23 +0000)]
am 8cce9dd8: DO NOT MERGE Rechecking unrestored items when launcher gets created am: fdbfba88d4  -s ours am: 852a96562a am: 153ccdf5ee am: dea24897a3  -s ours am: 11164db134 am: a6e267f851
am: 8712269056

* commit '8712269056303624b4367aae334cbb305b984a87':

8 years agoMerge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d0642...
Anton Hansson [Tue, 20 Oct 2015 02:23:48 +0000 (02:23 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d0642c4274 am: 216a53f0b1 am: aeb301c7e5 am: 817bbecd42 am: 14861fae4d am: 59fcb9ce40 am: f882fb27b7
am: c314292efc

* commit 'c314292efc6a0561af311dbbde90a24129c3d605':

8 years agoam 0c2918f4: Use View.generateViewId if available am: 3d78b80ecd am: 8374915b27 am...
Ian Parkinson [Tue, 20 Oct 2015 02:23:45 +0000 (02:23 +0000)]
am 0c2918f4: Use View.generateViewId if available am: 3d78b80ecd am: 8374915b27 am: ceb823f9ec am: 35a3ca532b am: 0317b768f6 am: 1f177aee96
am: 0af053b667

* commit '0af053b6670cb72a47be369c67baba429f713c73':

8 years agoMerge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 853b5...
Adam Skory [Tue, 20 Oct 2015 02:23:42 +0000 (02:23 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 853b55b96e am: 61172868fd am: 157e6c57d6 am: d078023bce am: 5b55c46e01 am: 186a1a7060 am: d566d24f65
am: b0436f294f

* commit 'b0436f294f98545b3256dcbd15e5907539ee4cd9':

8 years agoam 4b8d11fc: Add missing xxhdpi asset am: 49e2f10ee2 am: a42854b9b4 am: 53e87e86c2...
Adam Cohen [Tue, 20 Oct 2015 02:23:42 +0000 (02:23 +0000)]
am 4b8d11fc: Add missing xxhdpi asset am: 49e2f10ee2 am: a42854b9b4 am: 53e87e86c2 am: 11174f43bd am: 254e7b0a72 am: 7ad63c2b1e
am: 75d44b69c2

* commit '75d44b69c2be8bc1d121aac22b8114e4b11cea03':

8 years agoMerge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 9e3eb...
Adam Skory [Tue, 20 Oct 2015 02:23:37 +0000 (02:23 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 9e3ebf3c95 am: d072686669 am: f351edd651 am: 49bc959e07 am: 9c3d1aee2f am: 319c9ac41f am: 1497b879e4
am: 02173b0c65

* commit '02173b0c652488da5905c852f8b7870a5b2d5843':

8 years agoam 0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkc...
Kenny Guy [Tue, 20 Oct 2015 02:23:35 +0000 (02:23 +0000)]
am 0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop am: 5f2a520f0c am: 689cb6366b am: e431703711 am: 0fa7200b5a am: afc9a931cb am: 37ad5ed201
am: 652b89c123

* commit '652b89c1233c38c94b95e7be684621d3283fbbd5':

8 years agoMerge remote-tracking branch \'goog/ub-now-lunchbox\' into release am: 381fa3fb2d...
Adam Skory [Tue, 20 Oct 2015 02:23:31 +0000 (02:23 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release am: 381fa3fb2d am: f8f29b43ff am: 92557c9596 am: a324418ece am: 8194e08397 am: f41815802e am: 6dc5663ab3
am: f5437de749

* commit 'f5437de7499125fde5cd318d3000e7d53802eb79':

8 years agoam 52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into...
Adam Cohen [Tue, 20 Oct 2015 02:23:31 +0000 (02:23 +0000)]
am 52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop am: 91c11b28d5 am: 7e88e90afc am: b75de587c5 am: 29a81daa0d am: d077b9d137 am: 9a4f2f42c9
am: b05dcc69ad

* commit 'b05dcc69adc6b2ee08cd6ab619e6592a1668aca4':

8 years agoam 2ed99e86: Build Launcher3 against prebuilt SDK 21 am: c656245b9c am: 867cd087e3...
Bjorn Bringert [Tue, 20 Oct 2015 02:23:28 +0000 (02:23 +0000)]
am 2ed99e86: Build Launcher3 against prebuilt SDK 21 am: c656245b9c am: 867cd087e3 am: 5a7f0e0527 am: 326e88800d am: bd92113aa4 am: 6a8773d116
am: 836d372b84

* commit '836d372b84b94d31795f1bc5ad218a231929b40d':

8 years agoam 6d467e27: Merge "Resetting launcherProvider data if restore set was empty" into...
Sunny Goyal [Tue, 20 Oct 2015 02:23:23 +0000 (02:23 +0000)]
am 6d467e27: Merge "Resetting launcherProvider data if restore set was empty" into ub-now-porkchop am: e7599d6943 am: 5d36c5b03b am: ab1bfbf928 am: b1250ad81d am: dcb93ff314 am: 152a252bcb
am: 3f61431dab

* commit '3f61431dab766cd2b8a92aa34abe0c44304862ae':

8 years agoam 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop...
Baligh Uddin [Tue, 20 Oct 2015 02:23:19 +0000 (02:23 +0000)]
am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am: ab474588ce  -s ours am: eb8ce94244  -s ours am: 56985a1867  -s ours am: a03da71ae3  -s ours am: 8c0efbe340  -s ours am: 04e030ea81  -s ours
am: 00d2190a26  -s ours

* commit '00d2190a26c66fe9053b1fcbd612cc410ddd864d':

8 years agoam c5fb59fb: Fixing loadWorkspace being called multiple times Using right intent...
Sunny Goyal [Tue, 20 Oct 2015 02:23:13 +0000 (02:23 +0000)]
am c5fb59fb: Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons am: e43f0d646c am: ffe21b3129 am: f321db6800 am: d090146ad8 am: d5f0973229 am: fd58ec9eff
am: 58e3869dbf

* commit '58e3869dbfa188dad46aef00320613a0cda439e7':

8 years agoam f876301d: UI Fixes am: 501414523e am: 2f22fa892b am: 718278e9f4 am: 2550c9f472...
Sunny Goyal [Tue, 20 Oct 2015 02:23:10 +0000 (02:23 +0000)]
am f876301d: UI Fixes am: 501414523e am: 2f22fa892b am: 718278e9f4 am: 2550c9f472 am: 9e095af394 am: 40811df9d4
am: 4e10620cad

* commit '4e10620cad678a43425ef43262fc1515df6dbe1e':

8 years agoam d8f6253e: Merge "When ensuring screen exists, make sure it\'s actually referring...
Adam Cohen [Tue, 20 Oct 2015 02:23:05 +0000 (02:23 +0000)]
am d8f6253e: Merge "When ensuring screen exists, make sure it\'s actually referring to a screen, not a rank" into ub-now-porkchop am: cb20616a18 am: 86b4730bb5 am: 278d4d2d5a am: 9975db3a5e am: 48431f52c2 am: 99ee66568b
am: bc4aed2eec

* commit 'bc4aed2eec92820341d08fa32eb4bdcda1214242':

8 years agoam 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop...
Baligh Uddin [Tue, 20 Oct 2015 02:23:01 +0000 (02:23 +0000)]
am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am: 6317598a19  -s ours am: bfe4347964  -s ours am: 669ef65afb  -s ours am: 03937ac5d7  -s ours am: 909bcceeb4  -s ours am: 522d4ac6fe  -s ours
am: 3eaeafbebf  -s ours

* commit '3eaeafbebf191a5ea5c98592f2042424b3610fbd':

8 years agoam ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop am: e7afa51bd8...
Adam Cohen [Tue, 20 Oct 2015 02:06:36 +0000 (02:06 +0000)]
am ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop am: e7afa51bd8 am: 6d0a93207e am: a5eae84cbf am: e4eadaaf37 am: 58de3e8c64
am: b161e4e46e

* commit 'b161e4e46eea6e458f5cb2e1801063b153f5ad8b':

8 years agoam 755dd702: Merge "Fix missing screen when adding widget directly to provider" into...
Adam Cohen [Tue, 20 Oct 2015 02:06:32 +0000 (02:06 +0000)]
am 755dd702: Merge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop am: 84a79949a4 am: 313c1de1cc am: 20053bc691 am: f9c3e8a6ae am: cd4afe29cb
am: 2e1d9295f5

* commit '2e1d9295f5953f5bed9c641f3f2ea25eb698f003':

8 years agoam 8cce9dd8: DO NOT MERGE Rechecking unrestored items when launcher gets created...
Sunny Goyal [Tue, 20 Oct 2015 02:06:29 +0000 (02:06 +0000)]
am 8cce9dd8: DO NOT MERGE Rechecking unrestored items when launcher gets created am: fdbfba88d4  -s ours am: 852a96562a am: 153ccdf5ee am: dea24897a3  -s ours am: 11164db134
am: a6e267f851

* commit 'a6e267f851a84919c655ca5084e7e673f5eb0ac0':

8 years agoam 0c2918f4: Use View.generateViewId if available am: 3d78b80ecd am: 8374915b27 am...
Ian Parkinson [Tue, 20 Oct 2015 02:06:26 +0000 (02:06 +0000)]
am 0c2918f4: Use View.generateViewId if available am: 3d78b80ecd am: 8374915b27 am: ceb823f9ec am: 35a3ca532b am: 0317b768f6
am: 1f177aee96

* commit '1f177aee96763dbd08f25c7af1bd9c0049299593':

8 years agoam 4b8d11fc: Add missing xxhdpi asset am: 49e2f10ee2 am: a42854b9b4 am: 53e87e86c2...
Adam Cohen [Tue, 20 Oct 2015 02:06:22 +0000 (02:06 +0000)]
am 4b8d11fc: Add missing xxhdpi asset am: 49e2f10ee2 am: a42854b9b4 am: 53e87e86c2 am: 11174f43bd am: 254e7b0a72
am: 7ad63c2b1e

* commit '7ad63c2b1e356ca659ab62e4d9c39298ccbf593a':

8 years agoam 0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkc...
Kenny Guy [Tue, 20 Oct 2015 02:06:18 +0000 (02:06 +0000)]
am 0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop am: 5f2a520f0c am: 689cb6366b am: e431703711 am: 0fa7200b5a am: afc9a931cb
am: 37ad5ed201

* commit '37ad5ed201a3b5e6caa9933be3702adf4b877150':