OSDN Git Service
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
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
Baligh Uddin [Tue, 20 Oct 2015 03:24:08 +0000 (03:24 +0000)]
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':
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':
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':
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':
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':
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':
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':
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':
Baligh Uddin [Tue, 20 Oct 2015 03:23:19 +0000 (03:23 +0000)]
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
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
Baligh Uddin [Tue, 20 Oct 2015 03:21:56 +0000 (03:21 +0000)]
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':
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':
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':
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':
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':
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':
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':
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':
Baligh Uddin [Tue, 20 Oct 2015 03:21:19 +0000 (03:21 +0000)]
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
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
Baligh Uddin [Tue, 20 Oct 2015 03:19:32 +0000 (03:19 +0000)]
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':
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':
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':
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':
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':
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':
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':
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':
Baligh Uddin [Tue, 20 Oct 2015 03:19:03 +0000 (03:19 +0000)]
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':
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':
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':
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':
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':
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':
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':
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':
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':
Adam Skory [Tue, 20 Oct 2015 02:23:31 +0000 (02:23 +0000)]
Adam Cohen [Tue, 20 Oct 2015 02:06:36 +0000 (02:06 +0000)]
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':
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':
Ian Parkinson [Tue, 20 Oct 2015 02:06:26 +0000 (02:06 +0000)]
Adam Cohen [Tue, 20 Oct 2015 02:06:22 +0000 (02:06 +0000)]
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':
Adam Cohen [Tue, 20 Oct 2015 02:06:14 +0000 (02:06 +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
* commit '
9a4f2f42c9a6518002547fff05109c9d8b110a6f':
Bjorn Bringert [Tue, 20 Oct 2015 02:06:10 +0000 (02:06 +0000)]
Sunny Goyal [Tue, 20 Oct 2015 02:06:04 +0000 (02:06 +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
* commit '
152a252bcb810910171065e9e26e6047382b0839':
Huy Nguyen [Tue, 20 Oct 2015 02:06:02 +0000 (02:06 +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
* commit '
4cb42d165f221403fa377e70dbe83ac7dabb3bfa':
Mark Ashdown [Tue, 20 Oct 2015 02:05:57 +0000 (02:05 +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
* commit '
22c5b7f57d64cdcc38682cb1605a42faa6e1f104':
Baligh Uddin [Tue, 20 Oct 2015 02:05:57 +0000 (02:05 +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
* commit '
04e030ea81ad4beb16e93e02aa71049387645741':
Sunny Goyal [Tue, 20 Oct 2015 02:05:52 +0000 (02:05 +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
* commit '
fd58ec9eff0481782d1f4d1611a5cc4bc1ddabe6':
Huy Nguyen [Tue, 20 Oct 2015 02:05:50 +0000 (02:05 +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
* commit '
1115f891dd6fe65078c50ef9c6ac9b1ce415d082':
Mark Ashdown [Tue, 20 Oct 2015 02:05:46 +0000 (02:05 +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
* commit '
f616a8e2d14fa05ccc5c6e73ca57e9f454b7fd92':
Sunny Goyal [Tue, 20 Oct 2015 02:05:46 +0000 (02:05 +0000)]
Adam Cohen [Tue, 20 Oct 2015 02:05:41 +0000 (02:05 +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
* commit '
99ee66568bb94e2d4f4392101a1a9eb32c086c83':
Mathew Inwood [Tue, 20 Oct 2015 02:05:40 +0000 (02:05 +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
* commit '
d2688e3c3aaadc96e99f6b1c935140f1821818e0':
Baligh Uddin [Tue, 20 Oct 2015 02:05:28 +0000 (02:05 +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
* commit '
522d4ac6fe7e174b24e01fa7764ca7cfba2c2f12':
Juan Silveira [Tue, 20 Oct 2015 02:05:26 +0000 (02:05 +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
* commit '
8d9f5baea199ac79746d1467a5838b8a21dc040d':
Anton Hansson [Tue, 20 Oct 2015 02:05:23 +0000 (02:05 +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
* commit '
f882fb27b75fbfe76cb2321d0706f5aae28c828b':
Adam Skory [Tue, 20 Oct 2015 02:05:19 +0000 (02:05 +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
* commit '
d566d24f650d44765c47ac7db86532bace621181':
Adam Skory [Tue, 20 Oct 2015 02:05:15 +0000 (02:05 +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
* commit '
1497b879e4cc9845a1a424fa51a89f7cbdfe1a5a':
Adam Skory [Tue, 20 Oct 2015 02:05:09 +0000 (02:05 +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
* commit '
6dc5663ab3df6633278a04e9a4a23447b896062b':
Adam Cohen [Tue, 20 Oct 2015 01:49:54 +0000 (01:49 +0000)]
am
ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop am:
e7afa51bd8 am:
6d0a93207e am:
a5eae84cbf am:
e4eadaaf37
am:
58de3e8c64
* commit '
58de3e8c64c7f102c1c940b75f71ee5ab8071177':
Adam Cohen [Tue, 20 Oct 2015 01:49:49 +0000 (01:49 +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
* commit '
cd4afe29cb500d53c1fe77f93def97b2f11e0205':
Sunny Goyal [Tue, 20 Oct 2015 01:49:46 +0000 (01:49 +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
* commit '
11164db134012c57d41f58b7a88544b50f5c1729':
Ian Parkinson [Tue, 20 Oct 2015 01:49:43 +0000 (01:49 +0000)]
Adam Cohen [Tue, 20 Oct 2015 01:49:39 +0000 (01:49 +0000)]
Kenny Guy [Tue, 20 Oct 2015 01:49:36 +0000 (01:49 +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
* commit '
afc9a931cbabf849d79d55cc6bcd4dda6e728821':
Huy Nguyen [Tue, 20 Oct 2015 01:49:32 +0000 (01:49 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am:
8dc2ca68c1 am:
a59ef0ba69 am:
8acd2748b2 am:
52599958f4 am:
1c13c13722
am:
d848ca4869
* commit '
d848ca4869b4f0ae1ddc0ee7abe00984d6162cc1':
Adam Cohen [Tue, 20 Oct 2015 01:49:31 +0000 (01:49 +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
* commit '
d077b9d13700e9ce2271cb557b8788185ad2bbe9':
Bjorn Bringert [Tue, 20 Oct 2015 01:49:27 +0000 (01:49 +0000)]
Mark Ashdown [Tue, 20 Oct 2015 01:49:27 +0000 (01:49 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am:
a2bc37722e am:
b7b834bde1 am:
ca2bafc86f am:
9774281221 am:
6df4bd8b7f
am:
7f4c5f364f
* commit '
7f4c5f364fcc1a375688c9906b53786208785006':
Sunny Goyal [Tue, 20 Oct 2015 01:49:22 +0000 (01:49 +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
* commit '
dcb93ff314b957e371ba0cc8822486e840850956':
Huy Nguyen [Tue, 20 Oct 2015 01:49:22 +0000 (01:49 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am:
6cb8ae4c16 am:
2feee6dec2 am:
ab3847b8b3 am:
0cce0579a3 am:
8c9ef49ae5
am:
cbdc96152e
* commit '
cbdc96152e0ebc390732320a54bc3e25f37d1076':
Baligh Uddin [Tue, 20 Oct 2015 01:49:17 +0000 (01:49 +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
* commit '
8c0efbe340110eef9b0b3d4fcd471bcc053f1ef9':
Mark Ashdown [Tue, 20 Oct 2015 01:49:17 +0000 (01:49 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am:
7c9f33481f am:
68c0bedde8 am:
59329359e7 am:
daf2da93f6 am:
4cad8c7747
am:
1df97e4e4b
* commit '
1df97e4e4b2cd1ca83f125131bf59eddc1008bb7':
Sunny Goyal [Tue, 20 Oct 2015 01:49:12 +0000 (01:49 +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
* commit '
d5f09732299961917af57c4c1836d74e3f9ec2be':
Mathew Inwood [Tue, 20 Oct 2015 01:49:12 +0000 (01:49 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am:
56ca86b7c1 am:
52cced3ede am:
9cd759a5e1 am:
a9d4118ab3 am:
8020ebf7bc
am:
df112558f3
* commit '
df112558f378326e6ee7a8f49473384b30c6b10e':
Sunny Goyal [Tue, 20 Oct 2015 01:49:07 +0000 (01:49 +0000)]
Juan Silveira [Tue, 20 Oct 2015 01:49:07 +0000 (01:49 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am:
07130d400c am:
b6973a57c3 am:
a379acb1cb am:
28c9e80cc0 am:
abe2da3ed1
am:
67e3373948
* commit '
67e3373948a94b360febb62a068e128703e30450':
Adam Cohen [Tue, 20 Oct 2015 01:49:02 +0000 (01:49 +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
* commit '
48431f52c238c8a987d905546d265d1ac88e2cce':
Anton Hansson [Tue, 20 Oct 2015 01:49:01 +0000 (01:49 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am:
d0642c4274 am:
216a53f0b1 am:
aeb301c7e5 am:
817bbecd42 am:
14861fae4d
am:
59fcb9ce40
* commit '
59fcb9ce402c1bb5c9e833fec8c63e37047ab8da':
Baligh Uddin [Tue, 20 Oct 2015 01:48:55 +0000 (01:48 +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
* commit '
909bcceeb449284823d8fdbe4556f89b96577d75':
Adam Skory [Tue, 20 Oct 2015 01:48:55 +0000 (01:48 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am:
853b55b96e am:
61172868fd am:
157e6c57d6 am:
d078023bce am:
5b55c46e01
am:
186a1a7060
* commit '
186a1a7060308a383cd123fbdcd763d49587d99c':
Adam Skory [Tue, 20 Oct 2015 01:48:50 +0000 (01:48 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am:
9e3ebf3c95 am:
d072686669 am:
f351edd651 am:
49bc959e07 am:
9c3d1aee2f
am:
319c9ac41f
* commit '
319c9ac41fb545e6ca7f81b6d1d8fe22b9554e15':
Adam Skory [Tue, 20 Oct 2015 01:48:43 +0000 (01:48 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release am:
381fa3fb2d am:
f8f29b43ff am:
92557c9596 am:
a324418ece am:
8194e08397
am:
f41815802e
* commit '
f41815802ef91385c7c4c345e687956fa3e6f3c1':
Baligh Uddin [Tue, 20 Oct 2015 01:31:42 +0000 (01:31 +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
* commit '
1edcac1745cc34c1946a70ed8b64d33d4dd9b4bd':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 20 Oct 2015 01:31:39 +0000 (01:31 +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
* commit '
5148e0d456c3e33720b1ff9b8332ba1d2e371a3f':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 20 Oct 2015 01:31:37 +0000 (01:31 +0000)]
Huy Nguyen [Tue, 20 Oct 2015 01:31:34 +0000 (01:31 +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
* commit '
a107ef6e13b142d1eaffe879aa31d76292e357c3':
Mark Ashdown [Tue, 20 Oct 2015 01:31:30 +0000 (01:31 +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
* commit '
84138b152312dcdcfa387a797dbc7eca3bee7d6f':
Huy Nguyen [Tue, 20 Oct 2015 01:31:27 +0000 (01:31 +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
* commit '
6b7a1631f65318c70ec77c54d1acd532af19711d':