git.osdn.net Git - android-x86/packages-apps-Launcher3.git/log

(root) / android-x86 / packages-apps-Launcher3.git / log

Baligh Uddin [Tue, 20 Oct 2015 01:13:43 +0000 (01:13 +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

* commit '2d714406cd10431c3b6581377d76b373a227ca76':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 01:13:40 +0000 (01:13 +0000)]

Import translations. DO NOT MERGE am: c81b0617a6  -s ours am: 431d174f26  -s ours am: 8eef658cf9  -s ours
am: 1e6e698881  -s ours

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

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 01:13:37 +0000 (01:13 +0000)]

Import translations. DO NOT MERGE am: 81403969d1  -s ours am: bbe424e584  -s ours am: 5b53a47d02  -s ours
am: 9b7386403a  -s ours

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

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 01:13:34 +0000 (01:13 +0000)]

Import translations. DO NOT MERGE am: 01614d6ba5  -s ours am: 8454595cf3  -s ours am: 3f3f0fbc02  -s ours
am: 2693dd2cd9  -s ours

* commit '2693dd2cd982150a7f3354ca57151a6021417f08':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 01:13:31 +0000 (01:13 +0000)]

Import translations. DO NOT MERGE am: c4d66cf035  -s ours am: 3209b2bc4d  -s ours am: 69830841ec  -s ours
am: 4baaf3241f  -s ours

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

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 01:13:27 +0000 (01:13 +0000)]

am ddaac40d: am aebea1b0: keep history after reset to ub-now-lunchbox-release@1069658 am: 7fd445f4cc am: 5d6886a1cf am: 38bd557502
am: 0442deaee7

* commit '0442deaee7de92a0e6e929de53845bb165fb3562':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 01:13:24 +0000 (01:13 +0000)]

am e35f8e2c: am 8dc2ca68: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 149268d869 am: 70aa099f23 am: eadf9b6782
am: 24483f0498

* commit '24483f04982a10ed72cca92e3f8e396300e13730':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 01:13:21 +0000 (01:13 +0000)]

am 32e4344a: am a2bc3772: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: b1a081221e am: 1bd8f7e460 am: 7661d33379
am: 7e5ec74df0

* commit '7e5ec74df0d58e20732d0056e44c51b3ade9faf2':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 01:13:18 +0000 (01:13 +0000)]

am 49635c71: am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: fb1a32a63d am: 27b99c86e9 am: 078afac399
am: 94b7ee378f

* commit '94b7ee378f29b5539559019d35ba96734cf66692':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 01:13:15 +0000 (01:13 +0000)]

am a4d0ef3c: am 7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 64b83ce632 am: 346da07c80 am: 78a44d4726
am: 8abc959461

* commit '8abc959461e82023a7d92135c9003d031049edc1':

commit | commitdiff | tree

Mathew Inwood [Tue, 20 Oct 2015 01:13:12 +0000 (01:13 +0000)]

am 48e725bd: am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d5da3cc1d8 am: 7748c94d25 am: 4396cc1fff
am: a267cb6dde

* commit 'a267cb6ddef45a2293b70bd544919e0d8f1b27d0':

commit | commitdiff | tree

Juan Silveira [Tue, 20 Oct 2015 01:13:09 +0000 (01:13 +0000)]

am 9ee14249: am 07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 524ed6adda am: 3f39cc45d8 am: 6120e6096a
am: d9ba2b56db

* commit 'd9ba2b56dbb70f04310f87228a25b3cf04587d2f':

commit | commitdiff | tree

Anton Hansson [Tue, 20 Oct 2015 01:13:05 +0000 (01:13 +0000)]

am 6508fe1b: am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 0274f0a568 am: cb168d34ae am: 616facd74b
am: 4c5dbc52b3

* commit '4c5dbc52b3415966720f83c1a95a0b9fb3928b8f':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 01:13:00 +0000 (01:13 +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

* commit 'b523cc1e4f258fe4bd4d1ab1f78d97daceae239e':

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 01:12:54 +0000 (01:12 +0000)]

keep history after reset to ub-now-lunchbox-release@1069658 am: 2b8dbe3a5f am: 319e21ec62 am: ce566c0e93
am: 1c30b578e1

* commit '1c30b578e104035a7da6879e1722a2e99bfc11cf':
  Import translations. DO NOT MERGE
  Fix overlapping pages (issue 12551580)
  Properly saving migration cling keys.
  Tightening migration conditions. (Bug 11973614)
  Import translations. DO NOT MERGE
  Fix build
  Import translations. DO NOT MERGE
  Initial empty repository
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  override Launcher2 (aosp)

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 01:12:50 +0000 (01:12 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 8dc2ca68c1 am: a59ef0ba69 am: 8acd2748b2
am: 52599958f4

* commit '52599958f4afef66bc0eed3c3532489857467e2c':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 01:12:46 +0000 (01:12 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: a2bc37722e am: b7b834bde1 am: ca2bafc86f
am: 9774281221

* commit '9774281221d560dc61383c1d55a1aea77944485d':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 01:12:42 +0000 (01:12 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 6cb8ae4c16 am: 2feee6dec2 am: ab3847b8b3
am: 0cce0579a3

* commit '0cce0579a3630ccbaea6f8b3ad1685ec5e3c1e86':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 01:12:36 +0000 (01:12 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 7c9f33481f am: 68c0bedde8 am: 59329359e7
am: daf2da93f6

* commit 'daf2da93f60f775e611a75572f64390bc7b18eb5':

commit | commitdiff | tree

Mathew Inwood [Tue, 20 Oct 2015 01:12:29 +0000 (01:12 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 56ca86b7c1 am: 52cced3ede am: 9cd759a5e1
am: a9d4118ab3

* commit 'a9d4118ab36d15dbb14fbd38c55e00905b4a5250':

commit | commitdiff | tree

Juan Silveira [Tue, 20 Oct 2015 01:12:24 +0000 (01:12 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 07130d400c am: b6973a57c3 am: a379acb1cb
am: 28c9e80cc0

* commit '28c9e80cc092358330c5f42449739c208400c666':

commit | commitdiff | tree

Anton Hansson [Tue, 20 Oct 2015 01:12:18 +0000 (01:12 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d0642c4274 am: 216a53f0b1 am: aeb301c7e5
am: 817bbecd42

* commit '817bbecd42d21efe787b2bc90432f2f85edd4b28':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 01:12:14 +0000 (01:12 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 853b55b96e am: 61172868fd am: 157e6c57d6
am: d078023bce

* commit 'd078023bcee35457d2bbd804c58b89ee7eec9d17':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 01:12:08 +0000 (01:12 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 9e3ebf3c95 am: d072686669 am: f351edd651
am: 49bc959e07

* commit '49bc959e074295009b5024d43519f8ba3e20d0bb':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 01:12:02 +0000 (01:12 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release am: 381fa3fb2d am: f8f29b43ff am: 92557c9596
am: a324418ece

* commit 'a324418ecef0fff08695f29b6bf191049bf79598':

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 00:55:34 +0000 (00:55 +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

* commit '6cf8795a688fb2cf45a990114453d2dfa667bf75':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 00:55:31 +0000 (00:55 +0000)]

Import translations. DO NOT MERGE am: c81b0617a6  -s ours am: 431d174f26  -s ours
am: 8eef658cf9  -s ours

* commit '8eef658cf9ff1d06fa6b94aecff62b5f6bf66777':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 00:55:27 +0000 (00:55 +0000)]

Import translations. DO NOT MERGE am: 81403969d1  -s ours am: bbe424e584  -s ours
am: 5b53a47d02  -s ours

* commit '5b53a47d02a9f8150b01f704545e0e536d4b4a94':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 00:55:23 +0000 (00:55 +0000)]

Import translations. DO NOT MERGE am: 01614d6ba5  -s ours am: 8454595cf3  -s ours
am: 3f3f0fbc02  -s ours

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

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 00:55:21 +0000 (00:55 +0000)]

Import translations. DO NOT MERGE am: c4d66cf035  -s ours am: 3209b2bc4d  -s ours
am: 69830841ec  -s ours

* commit '69830841ec9b764074e9d0bb6156cb6dffda5ce2':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 00:55:17 +0000 (00:55 +0000)]

am ddaac40d: am aebea1b0: keep history after reset to ub-now-lunchbox-release@1069658 am: 7fd445f4cc am: 5d6886a1cf
am: 38bd557502

* commit '38bd557502c00c57c9ca9d58040a00cd552df3ca':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 00:55:13 +0000 (00:55 +0000)]

am e35f8e2c: am 8dc2ca68: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 149268d869 am: 70aa099f23
am: eadf9b6782

* commit 'eadf9b67829accc599154d46229b076906bb07f6':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 00:55:09 +0000 (00:55 +0000)]

am 32e4344a: am a2bc3772: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: b1a081221e am: 1bd8f7e460
am: 7661d33379

* commit '7661d3337931096845bc39e497bd458066597d02':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 00:55:05 +0000 (00:55 +0000)]

am 49635c71: am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: fb1a32a63d am: 27b99c86e9
am: 078afac399

* commit '078afac3991c38024de4ae373c1700d17cb3b4be':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 00:55:00 +0000 (00:55 +0000)]

am a4d0ef3c: am 7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 64b83ce632 am: 346da07c80
am: 78a44d4726

* commit '78a44d4726c15b4fd1c174ef748f2c050ee0cb87':

commit | commitdiff | tree

Mathew Inwood [Tue, 20 Oct 2015 00:54:55 +0000 (00:54 +0000)]

am 48e725bd: am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d5da3cc1d8 am: 7748c94d25
am: 4396cc1fff

* commit '4396cc1fffc4d25d2689826f8fe04eb82b32563f':

commit | commitdiff | tree

Adam Cohen [Tue, 20 Oct 2015 00:54:55 +0000 (00:54 +0000)]

am ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop am: e7afa51bd8
am: 6d0a93207e

* commit '6d0a93207ebb2ed8380e398ca3ecc5965975c778':

commit | commitdiff | tree

Adam Cohen [Tue, 20 Oct 2015 00:54:51 +0000 (00:54 +0000)]

am 755dd702: Merge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop am: 84a79949a4
am: 313c1de1cc

* commit '313c1de1cc69d9d4b59fd2b2f88fdba26bc8d4de':

commit | commitdiff | tree

Juan Silveira [Tue, 20 Oct 2015 00:54:50 +0000 (00:54 +0000)]

am 9ee14249: am 07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 524ed6adda am: 3f39cc45d8
am: 6120e6096a

* commit '6120e6096a2c3457817c618642a1166fec0dbd89':

commit | commitdiff | tree

Sunny Goyal [Tue, 20 Oct 2015 00:54:48 +0000 (00:54 +0000)]

am 8cce9dd8: DO NOT MERGE Rechecking unrestored items when launcher gets created am: fdbfba88d4 -s ours
am: 852a96562a

* commit '852a96562af274cb6768f7370436d632fcf7ed05':

commit | commitdiff | tree

Anton Hansson [Tue, 20 Oct 2015 00:54:46 +0000 (00:54 +0000)]

am 6508fe1b: am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 0274f0a568 am: cb168d34ae
am: 616facd74b

* commit '616facd74bea28fd88c2da240159cd87ec1972a5':

commit | commitdiff | tree

Ian Parkinson [Tue, 20 Oct 2015 00:54:44 +0000 (00:54 +0000)]

am 0c2918f4: Use View.generateViewId if available am: 3d78b80ecd
am: 8374915b27

* commit '8374915b27e98f02a6a0a3e61ad3085c7635226d':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 00:54:42 +0000 (00:54 +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':

commit | commitdiff | tree

Adam Cohen [Tue, 20 Oct 2015 00:54:41 +0000 (00:54 +0000)]

am 4b8d11fc: Add missing xxhdpi asset am: 49e2f10ee2
am: a42854b9b4

* commit 'a42854b9b44a188f76ffa41f5e2fa0f54a39b2f6':

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 00:54:39 +0000 (00:54 +0000)]

keep history after reset to ub-now-lunchbox-release@1069658 am: 2b8dbe3a5f am: 319e21ec62
am: ce566c0e93

* commit 'ce566c0e93436dd819e6910f08bf7575f20c2a19':
  Import translations. DO NOT MERGE
  Fix overlapping pages (issue 12551580)
  Properly saving migration cling keys.
  Tightening migration conditions. (Bug 11973614)
  Import translations. DO NOT MERGE
  Fix build
  Import translations. DO NOT MERGE
  Initial empty repository
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  override Launcher2 (aosp)

commit | commitdiff | tree

Kenny Guy [Tue, 20 Oct 2015 00:54:37 +0000 (00:54 +0000)]

am 0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop am: 5f2a520f0c
am: 689cb6366b

* commit '689cb6366b4cc4a205ad7a3696c04fe6f5ec28c3':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 00:54:31 +0000 (00:54 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 8dc2ca68c1 am: a59ef0ba69
am: 8acd2748b2

* commit '8acd2748b24de6535e8992494831e2c03937b61b':

commit | commitdiff | tree

Adam Cohen [Tue, 20 Oct 2015 00:54:31 +0000 (00:54 +0000)]

am 52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop am: 91c11b28d5
am: 7e88e90afc

* commit '7e88e90afc2fce3e64735ee0f11b9098193253d3':

commit | commitdiff | tree

Bjorn Bringert [Tue, 20 Oct 2015 00:54:27 +0000 (00:54 +0000)]

am 2ed99e86: Build Launcher3 against prebuilt SDK 21 am: c656245b9c
am: 867cd087e3

* commit '867cd087e32ac224ad87145f0b446a5606de0afe':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 00:54:26 +0000 (00:54 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: a2bc37722e am: b7b834bde1
am: ca2bafc86f

* commit 'ca2bafc86f947b1fe3bb3a2a21933329320d1a91':

commit | commitdiff | tree

Sunny Goyal [Tue, 20 Oct 2015 00:54:23 +0000 (00:54 +0000)]

am 6d467e27: Merge "Resetting launcherProvider data if restore set was empty" into ub-now-porkchop am: e7599d6943
am: 5d36c5b03b

* commit '5d36c5b03bbbd2906a74e4c9c17faa74f5d4c4ec':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 00:54:21 +0000 (00:54 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 6cb8ae4c16 am: 2feee6dec2
am: ab3847b8b3

* commit 'ab3847b8b34a691cd829bfdf0776521349049adf':

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 00:54:18 +0000 (00:54 +0000)]

am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am: ab474588ce -s ours
am: eb8ce94244 -s ours

* commit 'eb8ce94244706fd12d41740ad949469a10c5ab43':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 00:54:16 +0000 (00:54 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 7c9f33481f am: 68c0bedde8
am: 59329359e7

* commit '59329359e7530d5dee78c50b2c6c5b4993c7f02d':

commit | commitdiff | tree

Sunny Goyal [Tue, 20 Oct 2015 00:54:14 +0000 (00:54 +0000)]

am c5fb59fb: Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons am: e43f0d646c
am: ffe21b3129

* commit 'ffe21b31295b2195b219372394096253dda64e89':

commit | commitdiff | tree

Mathew Inwood [Tue, 20 Oct 2015 00:54:10 +0000 (00:54 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 56ca86b7c1 am: 52cced3ede
am: 9cd759a5e1

* commit '9cd759a5e130244b045ce42ca7155cf6dc829652':

commit | commitdiff | tree

Sunny Goyal [Tue, 20 Oct 2015 00:54:08 +0000 (00:54 +0000)]

am f876301d: UI Fixes am: 501414523e
am: 2f22fa892b

* commit '2f22fa892bb4cc40d26353cb8946d2a00a26eac4':

commit | commitdiff | tree

Juan Silveira [Tue, 20 Oct 2015 00:54:05 +0000 (00:54 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 07130d400c am: b6973a57c3
am: a379acb1cb

* commit 'a379acb1cbe729b44362666bf5a9ac8f27108622':

commit | commitdiff | tree

Adam Cohen [Tue, 20 Oct 2015 00:54:03 +0000 (00:54 +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

* commit '86b4730bb5217268c3abd4444c34b2876a7c3ebc':

commit | commitdiff | tree

Anton Hansson [Tue, 20 Oct 2015 00:54:00 +0000 (00:54 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d0642c4274 am: 216a53f0b1
am: aeb301c7e5

* commit 'aeb301c7e5c7d4727b3da4b67de46bcac7d2619d':

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 00:53:58 +0000 (00:53 +0000)]

am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am: 6317598a19 -s ours
am: bfe4347964 -s ours

* commit 'bfe43479643fece25c8aeabb64b90ca9d6c028be':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 00:53:54 +0000 (00:53 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 853b55b96e am: 61172868fd
am: 157e6c57d6

* commit '157e6c57d6b9093e2d491b979b4744fe35052242':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 00:53:49 +0000 (00:53 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 9e3ebf3c95 am: d072686669
am: f351edd651

* commit 'f351edd6519615d60cb646a6976bc69caa5e7dc2':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 00:53:44 +0000 (00:53 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release am: 381fa3fb2d am: f8f29b43ff
am: 92557c9596

* commit '92557c9596e2568336fe5f6d4bb36d579205feb2':

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 00:34:47 +0000 (00:34 +0000)]

am 869df29e: (-s ours) am c1ac011a: (-s ours) Import translations. DO NOT MERGE am: 35424cc2a6  -s ours
am: 8a901a6133  -s ours

* commit '8a901a6133308d8cc15dfbad1e96f1aa09028b9b':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 00:34:43 +0000 (00:34 +0000)]

Import translations. DO NOT MERGE am: c81b0617a6  -s ours
am: 431d174f26  -s ours

* commit '431d174f26eb82acdae1b045da7be921be12c93c':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 00:34:40 +0000 (00:34 +0000)]

Import translations. DO NOT MERGE am: 81403969d1  -s ours
am: bbe424e584  -s ours

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

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 00:34:37 +0000 (00:34 +0000)]

Import translations. DO NOT MERGE am: 01614d6ba5  -s ours
am: 8454595cf3  -s ours

* commit '8454595cf34fa406bd77665b4e72bfa3caed978e':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 00:34:33 +0000 (00:34 +0000)]

Import translations. DO NOT MERGE am: c4d66cf035  -s ours
am: 3209b2bc4d  -s ours

* commit '3209b2bc4d975f92a2d1b060de273da0789dbfce':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 00:34:30 +0000 (00:34 +0000)]

am ddaac40d: am aebea1b0: keep history after reset to ub-now-lunchbox-release@1069658 am: 7fd445f4cc
am: 5d6886a1cf

* commit '5d6886a1cf1387a86f6ed2abd0c0d139d0690eab':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 00:34:26 +0000 (00:34 +0000)]

am e35f8e2c: am 8dc2ca68: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 149268d869
am: 70aa099f23

* commit '70aa099f2381c7635e3f350335c55a0d038aded9':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 00:34:22 +0000 (00:34 +0000)]

am 32e4344a: am a2bc3772: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: b1a081221e
am: 1bd8f7e460

* commit '1bd8f7e4607eb43c153c6bdc9285f42a32bdc200':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 00:34:19 +0000 (00:34 +0000)]

am 49635c71: am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: fb1a32a63d
am: 27b99c86e9

* commit '27b99c86e9451e9aee5b73c00073e270d3f08361':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 00:34:16 +0000 (00:34 +0000)]

am a4d0ef3c: am 7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 64b83ce632
am: 346da07c80

* commit '346da07c80e2691060df29f66878cb63542fcf21':

commit | commitdiff | tree

Mathew Inwood [Tue, 20 Oct 2015 00:34:12 +0000 (00:34 +0000)]

am 48e725bd: am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d5da3cc1d8
am: 7748c94d25

* commit '7748c94d25f9593cb2951876f2f6888f2b4b5e05':

commit | commitdiff | tree

Juan Silveira [Tue, 20 Oct 2015 00:34:09 +0000 (00:34 +0000)]

am 9ee14249: am 07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 524ed6adda
am: 3f39cc45d8

* commit '3f39cc45d8b0e5a6cb3fa2ebe70af9aeb1af8085':

commit | commitdiff | tree

Anton Hansson [Tue, 20 Oct 2015 00:34:05 +0000 (00:34 +0000)]

am 6508fe1b: am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 0274f0a568
am: cb168d34ae

* commit 'cb168d34aef2da06f5d9110a07ceeca82b72f41d':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 00:34:00 +0000 (00:34 +0000)]

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

* commit '5c597e4abaec26e4fa715f93f0f7db688cc07d0d':

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 00:33:56 +0000 (00:33 +0000)]

keep history after reset to ub-now-lunchbox-release@1069658 am: 2b8dbe3a5f
am: 319e21ec62

* commit '319e21ec62f164af0ff9168de211d4b9baa4377b':
  Import translations. DO NOT MERGE
  Fix overlapping pages (issue 12551580)
  Properly saving migration cling keys.
  Tightening migration conditions. (Bug 11973614)
  Import translations. DO NOT MERGE
  Fix build
  Import translations. DO NOT MERGE
  Initial empty repository
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  override Launcher2 (aosp)

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 00:33:49 +0000 (00:33 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 8dc2ca68c1
am: a59ef0ba69

* commit 'a59ef0ba69f7b1346616a5c6896351ad85ed9b88':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 00:33:45 +0000 (00:33 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: a2bc37722e
am: b7b834bde1

* commit 'b7b834bde170c2b444e0b031f5ec703620252240':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 00:33:41 +0000 (00:33 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 6cb8ae4c16
am: 2feee6dec2

* commit '2feee6dec261eb70a83e30fb10620b29b5a8cf54':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 00:33:37 +0000 (00:33 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 7c9f33481f
am: 68c0bedde8

* commit '68c0bedde806eedfd25b4b726fa520c2a5c32a7a':

commit | commitdiff | tree

Mathew Inwood [Tue, 20 Oct 2015 00:33:33 +0000 (00:33 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 56ca86b7c1
am: 52cced3ede

* commit '52cced3edefa36f5be919f40327cef6f22d55bee':

commit | commitdiff | tree

Juan Silveira [Tue, 20 Oct 2015 00:33:30 +0000 (00:33 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 07130d400c
am: b6973a57c3

* commit 'b6973a57c35f4ff27034b088b4778b1bcbdb404b':

commit | commitdiff | tree

Anton Hansson [Tue, 20 Oct 2015 00:33:25 +0000 (00:33 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d0642c4274
am: 216a53f0b1

* commit '216a53f0b12c048a531dd7bdf3a02f59e18a808d':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 00:33:21 +0000 (00:33 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 853b55b96e
am: 61172868fd

* commit '61172868fde38da7f7ec8dcb84288d51095948e1':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 00:33:17 +0000 (00:33 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 9e3ebf3c95
am: d072686669

* commit 'd0726866694356f674ee80ca83ad97ff930bce20':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 00:33:10 +0000 (00:33 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release am: 381fa3fb2d
am: f8f29b43ff

* commit 'f8f29b43ff7ecf9346e12e965ee90480617525bf':

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 00:30:02 +0000 (00:30 +0000)]

am 869df29e: (-s ours) am c1ac011a: (-s ours) Import translations. DO NOT MERGE
am: 35424cc2a6 -s ours

* commit '35424cc2a6643609f82349c6903e1ee7c2d073dc':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 00:29:53 +0000 (00:29 +0000)]

Import translations. DO NOT MERGE
am: c81b0617a6 -s ours

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

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 00:29:49 +0000 (00:29 +0000)]

Import translations. DO NOT MERGE
am: 81403969d1 -s ours

* commit '81403969d1da3026b3d61b6e9ef72c9ffd7e2312':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 00:29:40 +0000 (00:29 +0000)]

Import translations. DO NOT MERGE
am: 01614d6ba5 -s ours

* commit '01614d6ba5de7484310e14b2ab19ae6161c48562':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 00:29:33 +0000 (00:29 +0000)]

Import translations. DO NOT MERGE
am: c4d66cf035 -s ours

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

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 00:29:27 +0000 (00:29 +0000)]

am ddaac40d: am aebea1b0: keep history after reset to ub-now-lunchbox-release@1069658
am: 7fd445f4cc

* commit '7fd445f4ccdde932505319bf3a45d3a7523c6494':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 00:29:21 +0000 (00:29 +0000)]

am e35f8e2c: am 8dc2ca68: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
am: 149268d869

* commit '149268d8698f316a70cce2515e7787334e62d23d':

commit | commitdiff | tree

Adam Cohen [Tue, 20 Oct 2015 00:29:19 +0000 (00:29 +0000)]

am ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop
am: e7afa51bd8

* commit 'e7afa51bd8f0f0b9f21bd63a9ceeb9f330259fc2':

commit | commitdiff | tree

Adam Cohen [Tue, 20 Oct 2015 00:29:15 +0000 (00:29 +0000)]

am 755dd702: Merge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop
am: 84a79949a4

* commit '84a79949a478f8b91c7fcc9346525f7dd187f548':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 00:29:15 +0000 (00:29 +0000)]

am 32e4344a: am a2bc3772: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
am: b1a081221e

* commit 'b1a081221e3d9e937d2b629e6ec083c3c5a4aa55':

commit | commitdiff | tree

Sunny Goyal [Tue, 20 Oct 2015 00:29:10 +0000 (00:29 +0000)]

am 8cce9dd8: DO NOT MERGE Rechecking unrestored items when launcher gets created
am: fdbfba88d4 -s ours

* commit 'fdbfba88d4f08d7a721d91b7e3d30ee5a290be6e':

packages/apps/Launcher3

RSS Atom

About OSDN

Find Software

Develop Software

Help