OSDN Git Service
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':
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':
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':
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':
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':
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':
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)
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
Ian Parkinson [Tue, 20 Oct 2015 00:54:44 +0000 (00:54 +0000)]
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':
Adam Cohen [Tue, 20 Oct 2015 00:54:41 +0000 (00:54 +0000)]
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)
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':
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':
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':
Bjorn Bringert [Tue, 20 Oct 2015 00:54:27 +0000 (00:54 +0000)]
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':
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':
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':
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':
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':
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':
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':
Sunny Goyal [Tue, 20 Oct 2015 00:54:08 +0000 (00:54 +0000)]
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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)
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
Huy Nguyen [Tue, 20 Oct 2015 00:29:10 +0000 (00:29 +0000)]
am
49635c71: am
6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
am:
fb1a32a63d
* commit '
fb1a32a63d59d65419e0b0db0124cec445b992cc':
Mark Ashdown [Tue, 20 Oct 2015 00:29:06 +0000 (00:29 +0000)]
am
a4d0ef3c: am
7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
am:
64b83ce632
* commit '
64b83ce632c424f09dbce504be60f5ef9c249e45':
Ian Parkinson [Tue, 20 Oct 2015 00:29:04 +0000 (00:29 +0000)]
am
0c2918f4: Use View.generateViewId if available
am:
3d78b80ecd
* commit '
3d78b80ecdfeec7704b2aa82ce39823fa903ea61':
Mathew Inwood [Tue, 20 Oct 2015 00:29:00 +0000 (00:29 +0000)]
am
48e725bd: am
56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
am:
d5da3cc1d8
* commit '
d5da3cc1d8e534f60925514bbc7d1e72b225cd97':
Adam Cohen [Tue, 20 Oct 2015 00:28:59 +0000 (00:28 +0000)]
Kenny Guy [Tue, 20 Oct 2015 00:28:53 +0000 (00:28 +0000)]
am
0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop
am:
5f2a520f0c
* commit '
5f2a520f0cd47b274bdf809d7b665c956c2717ed':
Juan Silveira [Tue, 20 Oct 2015 00:28:52 +0000 (00:28 +0000)]
am
9ee14249: am
07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
am:
524ed6adda
* commit '
524ed6addab4294f3be29cfbef5ef571077ca3a4':
Anton Hansson [Tue, 20 Oct 2015 00:28:46 +0000 (00:28 +0000)]
am
6508fe1b: am
d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
am:
0274f0a568
* commit '
0274f0a568fed5aa57d0c40acfb74bea67cba29a':
Adam Cohen [Tue, 20 Oct 2015 00:28:44 +0000 (00:28 +0000)]
am
52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop
am:
91c11b28d5
* commit '
91c11b28d57c026d507488c58feedebf7fee6f31':
Adam Skory [Tue, 20 Oct 2015 00:28:39 +0000 (00:28 +0000)]
am
b3461336: (-s ours) am
853b55b9: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
am:
5cc929caa0
* commit '
5cc929caa0922e0b80dbf3f6c099d841c3797c20':
Bjorn Bringert [Tue, 20 Oct 2015 00:28:36 +0000 (00:28 +0000)]
am
2ed99e86: Build Launcher3 against prebuilt SDK 21
am:
c656245b9c
* commit '
c656245b9cbc370537afb18e7fb38ea87c233fd1':
Baligh Uddin [Tue, 20 Oct 2015 00:28:33 +0000 (00:28 +0000)]
keep history after reset to ub-now-lunchbox-release@
1069658
am:
2b8dbe3a5f
* commit '
2b8dbe3a5f5f673e87aa4b13133a4d3bf2b98b3c':
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)
Sunny Goyal [Tue, 20 Oct 2015 00:28:30 +0000 (00:28 +0000)]
am
6d467e27: Merge "Resetting launcherProvider data if restore set was empty" into ub-now-porkchop
am:
e7599d6943
* commit '
e7599d694313845a41221dfa0d7f6dca3aedd02c':
Huy Nguyen [Tue, 20 Oct 2015 00:28:28 +0000 (00:28 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
am:
8dc2ca68c1
* commit '
8dc2ca68c1ccf1570caec3e52c2671b323cf7102':
Baligh Uddin [Tue, 20 Oct 2015 00:28:25 +0000 (00:28 +0000)]
am
10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
am:
ab474588ce -s ours
* commit '
ab474588ce7d9cddff2b2dc0a2fd91b4ae532e05':
Mark Ashdown [Tue, 20 Oct 2015 00:28:23 +0000 (00:28 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
am:
a2bc37722e
* commit '
a2bc37722e9fa0af9d67986038aec58af5308771':
Sunny Goyal [Tue, 20 Oct 2015 00:28:19 +0000 (00:28 +0000)]
am
c5fb59fb: Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons
am:
e43f0d646c
* commit '
e43f0d646c60c6f59333224686725717cdf2ccbc':
Huy Nguyen [Tue, 20 Oct 2015 00:28:15 +0000 (00:28 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
am:
6cb8ae4c16
* commit '
6cb8ae4c16cb3b0105ebfbb23be23e0fb1131496':
Sunny Goyal [Tue, 20 Oct 2015 00:28:14 +0000 (00:28 +0000)]
Mark Ashdown [Tue, 20 Oct 2015 00:28:10 +0000 (00:28 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
am:
7c9f33481f
* commit '
7c9f33481fd3c063495813b2772e198ed696e3ce':
Adam Cohen [Tue, 20 Oct 2015 00:28:06 +0000 (00:28 +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
* commit '
cb20616a180de2855cc35e6c1ce8dfb8082ea41c':
Mathew Inwood [Tue, 20 Oct 2015 00:28:05 +0000 (00:28 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
am:
56ca86b7c1
* commit '
56ca86b7c177fd6fb330d6cb3631070e8689cd87':
Juan Silveira [Tue, 20 Oct 2015 00:28:01 +0000 (00:28 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
am:
07130d400c
* commit '
07130d400c52518e413e58334525f1598c3b8f1a':
Baligh Uddin [Tue, 20 Oct 2015 00:28:00 +0000 (00:28 +0000)]
am
68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
am:
6317598a19 -s ours
* commit '
6317598a196ada3f32950c7f4a8d5cfe005acf42':
Anton Hansson [Tue, 20 Oct 2015 00:27:55 +0000 (00:27 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
am:
d0642c4274
* commit '
d0642c4274abcbede9177d61b0f072689db889a9':
Adam Skory [Tue, 20 Oct 2015 00:27:51 +0000 (00:27 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
am:
853b55b96e
* commit '
853b55b96e4af7a4f949a22cc084bd333e528c1c':
Adam Skory [Tue, 20 Oct 2015 00:27:43 +0000 (00:27 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
am:
9e3ebf3c95
* commit '
9e3ebf3c95fbf4b7a96b6080802ca23e5098fe40':
Adam Skory [Tue, 20 Oct 2015 00:27:39 +0000 (00:27 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release
am:
381fa3fb2d
* commit '
381fa3fb2d990f7976a898c16f3675dbb325b848':
The Android Automerger [Tue, 3 Feb 2015 17:05:59 +0000 (09:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
Nick Kralevich [Sat, 18 Oct 2014 13:57:06 +0000 (06:57 -0700)]
fix build
Bug:
18040469
Change-Id: I24db4d3f4b7ee10ecf5a2c65035ce112271539fb
Nick Kralevich [Sat, 18 Oct 2014 15:14:09 +0000 (08:14 -0700)]
fix build
Bug:
18040469
Change-Id: I2938c7b950470eeacfb20391f109ae44d95060c7
The Android Automerger [Tue, 9 Dec 2014 01:22:44 +0000 (01:22 +0000)]
merge in ub-now-queens-release history after reset to ub-now-queens