Commit Graph

10070 Commits

Author SHA1 Message Date
Baligh Uddin a34c8cc2ba Import translations. DO NOT MERGE am: 2c29ac6eb5 -s ours am: b58e5fbc57 -s ours am: 2aa01afb35 -s ours
am: 25c42a0937  -s ours

* commit '25c42a09370a96264a84bc44e7ab502bc687bc45':
  Import translations. DO NOT MERGE
2015-10-20 01:13:47 +00:00
Baligh Uddin ed94b5520d 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
2015-10-20 01:13:43 +00:00
Baligh Uddin cfb6dac38f 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
2015-10-20 01:13:40 +00:00
Baligh Uddin 994502244e 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
2015-10-20 01:13:37 +00:00
Baligh Uddin 1edcac1745 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
2015-10-20 01:13:34 +00:00
Baligh Uddin 5148e0d456 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
2015-10-20 01:13:31 +00:00
Baligh Uddin 5793b647fd am ddaac40d: am aebea1b0: keep history after reset to ub-now-lunchbox-release@1069658 am: 7fd445f4cc am: 5d6886a1cf am: 38bd557502
am: 0442deaee7

* commit '0442deaee7de92a0e6e929de53845bb165fb3562':
2015-10-20 01:13:27 +00:00
Huy Nguyen a107ef6e13 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':
2015-10-20 01:13:24 +00:00
Mark Ashdown 84138b1523 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':
2015-10-20 01:13:21 +00:00
Huy Nguyen 6b7a1631f6 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':
2015-10-20 01:13:18 +00:00
Mark Ashdown 6060c10580 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':
2015-10-20 01:13:15 +00:00
Mathew Inwood f289060a04 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':
2015-10-20 01:13:12 +00:00
Juan Silveira 8dc63a93c6 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':
2015-10-20 01:13:09 +00:00
Anton Hansson ed0c3623a9 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':
2015-10-20 01:13:05 +00:00
Adam Skory 622880c0b9 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':
2015-10-20 01:13:00 +00:00
Baligh Uddin 9fa7ca7d65 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)
2015-10-20 01:12:54 +00:00
Huy Nguyen 1c13c13722 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 8dc2ca68c1 am: a59ef0ba69 am: 8acd2748b2
am: 52599958f4

* commit '52599958f4afef66bc0eed3c3532489857467e2c':
2015-10-20 01:12:50 +00:00
Mark Ashdown 6df4bd8b7f Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: a2bc37722e am: b7b834bde1 am: ca2bafc86f
am: 9774281221

* commit '9774281221d560dc61383c1d55a1aea77944485d':
2015-10-20 01:12:46 +00:00
Huy Nguyen 8c9ef49ae5 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 6cb8ae4c16 am: 2feee6dec2 am: ab3847b8b3
am: 0cce0579a3

* commit '0cce0579a3630ccbaea6f8b3ad1685ec5e3c1e86':
2015-10-20 01:12:42 +00:00
Mark Ashdown 4cad8c7747 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 7c9f33481f am: 68c0bedde8 am: 59329359e7
am: daf2da93f6

* commit 'daf2da93f60f775e611a75572f64390bc7b18eb5':
2015-10-20 01:12:36 +00:00
Mathew Inwood 8020ebf7bc Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 56ca86b7c1 am: 52cced3ede am: 9cd759a5e1
am: a9d4118ab3

* commit 'a9d4118ab36d15dbb14fbd38c55e00905b4a5250':
2015-10-20 01:12:29 +00:00
Juan Silveira abe2da3ed1 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 07130d400c am: b6973a57c3 am: a379acb1cb
am: 28c9e80cc0

* commit '28c9e80cc092358330c5f42449739c208400c666':
2015-10-20 01:12:24 +00:00
Anton Hansson 14861fae4d Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d0642c4274 am: 216a53f0b1 am: aeb301c7e5
am: 817bbecd42

* commit '817bbecd42d21efe787b2bc90432f2f85edd4b28':
2015-10-20 01:12:18 +00:00
Adam Skory 5b55c46e01 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 853b55b96e am: 61172868fd am: 157e6c57d6
am: d078023bce

* commit 'd078023bcee35457d2bbd804c58b89ee7eec9d17':
2015-10-20 01:12:14 +00:00
Adam Skory 9c3d1aee2f Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 9e3ebf3c95 am: d072686669 am: f351edd651
am: 49bc959e07

* commit '49bc959e074295009b5024d43519f8ba3e20d0bb':
2015-10-20 01:12:08 +00:00
Adam Skory 8194e08397 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release am: 381fa3fb2d am: f8f29b43ff am: 92557c9596
am: a324418ece

* commit 'a324418ecef0fff08695f29b6bf191049bf79598':
2015-10-20 01:12:02 +00:00
Baligh Uddin 25c42a0937 Import translations. DO NOT MERGE am: 2c29ac6eb5 -s ours am: b58e5fbc57 -s ours
am: 2aa01afb35  -s ours

* commit '2aa01afb35e037f6598eb0e6ca3619f618425290':
  Import translations. DO NOT MERGE
2015-10-20 00:55:38 +00:00
Baligh Uddin 2d714406cd 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
2015-10-20 00:55:34 +00:00
Baligh Uddin 1e6e698881 Import translations. DO NOT MERGE am: c81b0617a6 -s ours am: 431d174f26 -s ours
am: 8eef658cf9  -s ours

* commit '8eef658cf9ff1d06fa6b94aecff62b5f6bf66777':
  Import translations. DO NOT MERGE
2015-10-20 00:55:31 +00:00
Baligh Uddin 9b7386403a Import translations. DO NOT MERGE am: 81403969d1 -s ours am: bbe424e584 -s ours
am: 5b53a47d02  -s ours

* commit '5b53a47d02a9f8150b01f704545e0e536d4b4a94':
  Import translations. DO NOT MERGE
2015-10-20 00:55:27 +00:00
Baligh Uddin 2693dd2cd9 Import translations. DO NOT MERGE am: 01614d6ba5 -s ours am: 8454595cf3 -s ours
am: 3f3f0fbc02  -s ours

* commit '3f3f0fbc021036c341b5c0caa23e7af0ee66f513':
  Import translations. DO NOT MERGE
2015-10-20 00:55:23 +00:00
Baligh Uddin 4baaf3241f Import translations. DO NOT MERGE am: c4d66cf035 -s ours am: 3209b2bc4d -s ours
am: 69830841ec  -s ours

* commit '69830841ec9b764074e9d0bb6156cb6dffda5ce2':
  Import translations. DO NOT MERGE
2015-10-20 00:55:21 +00:00
Baligh Uddin 0442deaee7 am ddaac40d: am aebea1b0: keep history after reset to ub-now-lunchbox-release@1069658 am: 7fd445f4cc am: 5d6886a1cf
am: 38bd557502

* commit '38bd557502c00c57c9ca9d58040a00cd552df3ca':
2015-10-20 00:55:17 +00:00
Huy Nguyen 24483f0498 am e35f8e2c: am 8dc2ca68: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 149268d869 am: 70aa099f23
am: eadf9b6782

* commit 'eadf9b67829accc599154d46229b076906bb07f6':
2015-10-20 00:55:13 +00:00
Mark Ashdown 7e5ec74df0 am 32e4344a: am a2bc3772: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: b1a081221e am: 1bd8f7e460
am: 7661d33379

* commit '7661d3337931096845bc39e497bd458066597d02':
2015-10-20 00:55:09 +00:00
Huy Nguyen 94b7ee378f am 49635c71: am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: fb1a32a63d am: 27b99c86e9
am: 078afac399

* commit '078afac3991c38024de4ae373c1700d17cb3b4be':
2015-10-20 00:55:05 +00:00
Mark Ashdown 8abc959461 am a4d0ef3c: am 7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 64b83ce632 am: 346da07c80
am: 78a44d4726

* commit '78a44d4726c15b4fd1c174ef748f2c050ee0cb87':
2015-10-20 00:55:00 +00:00
Mathew Inwood a267cb6dde am 48e725bd: am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d5da3cc1d8 am: 7748c94d25
am: 4396cc1fff

* commit '4396cc1fffc4d25d2689826f8fe04eb82b32563f':
2015-10-20 00:54:55 +00:00
Adam Cohen a5eae84cbf am ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop am: e7afa51bd8
am: 6d0a93207e

* commit '6d0a93207ebb2ed8380e398ca3ecc5965975c778':
2015-10-20 00:54:55 +00:00
Adam Cohen 20053bc691 am 755dd702: Merge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop am: 84a79949a4
am: 313c1de1cc

* commit '313c1de1cc69d9d4b59fd2b2f88fdba26bc8d4de':
2015-10-20 00:54:51 +00:00
Juan Silveira d9ba2b56db am 9ee14249: am 07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 524ed6adda am: 3f39cc45d8
am: 6120e6096a

* commit '6120e6096a2c3457817c618642a1166fec0dbd89':
2015-10-20 00:54:50 +00:00
Sunny Goyal 153ccdf5ee am 8cce9dd8: DO NOT MERGE Rechecking unrestored items when launcher gets created am: fdbfba88d4 -s ours
am: 852a96562a

* commit '852a96562af274cb6768f7370436d632fcf7ed05':
2015-10-20 00:54:48 +00:00
Anton Hansson 4c5dbc52b3 am 6508fe1b: am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 0274f0a568 am: cb168d34ae
am: 616facd74b

* commit '616facd74bea28fd88c2da240159cd87ec1972a5':
2015-10-20 00:54:46 +00:00
Ian Parkinson ceb823f9ec am 0c2918f4: Use View.generateViewId if available am: 3d78b80ecd
am: 8374915b27

* commit '8374915b27e98f02a6a0a3e61ad3085c7635226d':
2015-10-20 00:54:44 +00:00
Adam Skory b523cc1e4f 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':
2015-10-20 00:54:42 +00:00
Adam Cohen 53e87e86c2 am 4b8d11fc: Add missing xxhdpi asset am: 49e2f10ee2
am: a42854b9b4

* commit 'a42854b9b44a188f76ffa41f5e2fa0f54a39b2f6':
2015-10-20 00:54:41 +00:00
Baligh Uddin 1c30b578e1 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)
2015-10-20 00:54:39 +00:00
Kenny Guy e431703711 am 0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop am: 5f2a520f0c
am: 689cb6366b

* commit '689cb6366b4cc4a205ad7a3696c04fe6f5ec28c3':
2015-10-20 00:54:37 +00:00
Huy Nguyen 52599958f4 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 8dc2ca68c1 am: a59ef0ba69
am: 8acd2748b2

* commit '8acd2748b24de6535e8992494831e2c03937b61b':
2015-10-20 00:54:31 +00:00
Adam Cohen b75de587c5 am 52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop am: 91c11b28d5
am: 7e88e90afc

* commit '7e88e90afc2fce3e64735ee0f11b9098193253d3':
2015-10-20 00:54:31 +00:00