Martijn Coenen
53b345dd22
Merge "Add NfcNci to default builds." into oc-dev
2017-04-14 03:18:40 +00:00
Adam Seaton
8891d2773b
Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f am: f84d2ddb50 am: d236029c61 am: a34ba7f284 am: 72c26c936b am: fcac1e2dda am: 51c0c361a6 am: 51321907ce am: d671313b5d am: 6ee17025d4
...
am: 822b3f7bf4
2017-04-13 23:26:23 +00:00
Adam Seaton
c55849c9b9
[DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours am: b57f591fef am: 5e089f6be9 am: 6e52769b01 am: 53980e19aa -s ours am: 773e5235e6 am: 594667da85 am: 2ae448cdb0 -s ours am: 7038c523a9 -s ours am: 35a5e32514 -s ours am: 55a3be5bc5 -s ours
...
am: eb3dadebf6
2017-04-13 23:26:15 +00:00
Adam Seaton
9a4b41442b
Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 am: 2596931e86 am: cf896d4bcb am: d8dbdc0809 -s ours am: a0e65c2249 am: 5f77d46693 am: c88e5bdef3 am: a8cd228fc7 am: 5b6859d20d am: 29eab65da9
...
am: a8b8550fa8
2017-04-13 23:26:00 +00:00
Adam Seaton
822b3f7bf4
Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f am: f84d2ddb50 am: d236029c61 am: a34ba7f284 am: 72c26c936b am: fcac1e2dda am: 51c0c361a6 am: 51321907ce am: d671313b5d
...
am: 6ee17025d4
2017-04-13 23:20:26 +00:00
Adam Seaton
eb3dadebf6
[DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours am: b57f591fef am: 5e089f6be9 am: 6e52769b01 am: 53980e19aa -s ours am: 773e5235e6 am: 594667da85 am: 2ae448cdb0 -s ours am: 7038c523a9 -s ours am: 35a5e32514 -s ours
...
am: 55a3be5bc5
2017-04-13 23:20:17 +00:00
Adam Seaton
a8b8550fa8
Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 am: 2596931e86 am: cf896d4bcb am: d8dbdc0809 -s ours am: a0e65c2249 am: 5f77d46693 am: c88e5bdef3 am: a8cd228fc7 am: 5b6859d20d
...
am: 29eab65da9
2017-04-13 23:19:59 +00:00
Adam Seaton
61d5798ba8
Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f am: f84d2ddb50 am: d236029c61 am: a34ba7f284 am: 72c26c936b am: fcac1e2dda am: 51c0c361a6 am: 6be965be74
...
am: 12d7052ea6
2017-04-13 23:14:19 +00:00
Adam Seaton
6ee17025d4
Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f am: f84d2ddb50 am: d236029c61 am: a34ba7f284 am: 72c26c936b am: fcac1e2dda am: 51c0c361a6 am: 51321907ce
...
am: d671313b5d
2017-04-13 23:14:18 +00:00
Adam Seaton
55a3be5bc5
[DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours am: b57f591fef am: 5e089f6be9 am: 6e52769b01 am: 53980e19aa -s ours am: 773e5235e6 am: 594667da85 am: 2ae448cdb0 -s ours am: 7038c523a9 -s ours
...
am: 35a5e32514
2017-04-13 23:14:11 +00:00
Adam Seaton
be9f4b6c25
[DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours am: b57f591fef am: 5e089f6be9 am: 6e52769b01 am: 53980e19aa -s ours am: 773e5235e6 am: 594667da85 am: 2ae448cdb0 am: 0a38661a39
...
am: 521d7efcc3
2017-04-13 23:14:11 +00:00
Adam Seaton
513272340b
Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 am: 2596931e86 am: cf896d4bcb am: d8dbdc0809 -s ours am: a0e65c2249 am: 5f77d46693 am: c88e5bdef3 am: 07d9fa6787
...
am: 8f91143bde
2017-04-13 23:13:59 +00:00
Adam Seaton
29eab65da9
Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 am: 2596931e86 am: cf896d4bcb am: d8dbdc0809 -s ours am: a0e65c2249 am: 5f77d46693 am: c88e5bdef3 am: a8cd228fc7
...
am: 5b6859d20d
2017-04-13 23:13:58 +00:00
Adam Seaton
12d7052ea6
Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f am: f84d2ddb50 am: d236029c61 am: a34ba7f284 am: 72c26c936b am: fcac1e2dda am: 51c0c361a6
...
am: 6be965be74
2017-04-13 23:08:20 +00:00
Adam Seaton
d671313b5d
Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f am: f84d2ddb50 am: d236029c61 am: a34ba7f284 am: 72c26c936b am: fcac1e2dda am: 51c0c361a6
...
am: 51321907ce
2017-04-13 23:08:17 +00:00
Adam Seaton
521d7efcc3
[DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours am: b57f591fef am: 5e089f6be9 am: 6e52769b01 am: 53980e19aa -s ours am: 773e5235e6 am: 594667da85 am: 2ae448cdb0
...
am: 0a38661a39
2017-04-13 23:08:12 +00:00
Adam Seaton
35a5e32514
[DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours am: b57f591fef am: 5e089f6be9 am: 6e52769b01 am: 53980e19aa -s ours am: 773e5235e6 am: 594667da85 am: 2ae448cdb0 -s ours
...
am: 7038c523a9
2017-04-13 23:08:09 +00:00
Adam Seaton
8f91143bde
Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 am: 2596931e86 am: cf896d4bcb am: d8dbdc0809 -s ours am: a0e65c2249 am: 5f77d46693 am: c88e5bdef3
...
am: 07d9fa6787
2017-04-13 23:07:58 +00:00
Adam Seaton
5b6859d20d
Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 am: 2596931e86 am: cf896d4bcb am: d8dbdc0809 -s ours am: a0e65c2249 am: 5f77d46693 am: c88e5bdef3
...
am: a8cd228fc7
2017-04-13 23:07:58 +00:00
Adam Seaton
6be965be74
Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f am: f84d2ddb50 am: d236029c61 am: a34ba7f284 am: 72c26c936b am: fcac1e2dda
...
am: 51c0c361a6
2017-04-13 23:02:19 +00:00
Adam Seaton
51321907ce
Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f am: f84d2ddb50 am: d236029c61 am: a34ba7f284 am: 72c26c936b am: fcac1e2dda
...
am: 51c0c361a6
2017-04-13 23:02:18 +00:00
Adam Seaton
0a38661a39
[DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours am: b57f591fef am: 5e089f6be9 am: 6e52769b01 am: 53980e19aa -s ours am: 773e5235e6 am: 594667da85
...
am: 2ae448cdb0
2017-04-13 23:02:12 +00:00
Adam Seaton
7038c523a9
[DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours am: b57f591fef am: 5e089f6be9 am: 6e52769b01 am: 53980e19aa -s ours am: 773e5235e6 am: 594667da85
...
am: 2ae448cdb0
2017-04-13 23:02:10 +00:00
Adam Seaton
07d9fa6787
Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 am: 2596931e86 am: cf896d4bcb am: d8dbdc0809 -s ours am: a0e65c2249 am: 5f77d46693
...
am: c88e5bdef3
2017-04-13 23:01:58 +00:00
Adam Seaton
a8cd228fc7
Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 am: 2596931e86 am: cf896d4bcb am: d8dbdc0809 -s ours am: a0e65c2249 am: 5f77d46693
...
am: c88e5bdef3
2017-04-13 23:01:58 +00:00
Adam Seaton
51c0c361a6
Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f am: f84d2ddb50 am: d236029c61 am: a34ba7f284 am: 72c26c936b
...
am: fcac1e2dda
2017-04-13 22:55:52 +00:00
Adam Seaton
2ae448cdb0
[DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours am: b57f591fef am: 5e089f6be9 am: 6e52769b01 am: 53980e19aa -s ours am: 773e5235e6
...
am: 594667da85
2017-04-13 22:55:42 +00:00
Adam Seaton
c88e5bdef3
Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 am: 2596931e86 am: cf896d4bcb am: d8dbdc0809 -s ours am: a0e65c2249
...
am: 5f77d46693
2017-04-13 22:55:28 +00:00
Adam Seaton
fcac1e2dda
Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f am: f84d2ddb50 am: d236029c61 am: a34ba7f284
...
am: 72c26c936b
2017-04-13 22:49:18 +00:00
Adam Seaton
594667da85
[DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours am: b57f591fef am: 5e089f6be9 am: 6e52769b01 am: 53980e19aa -s ours
...
am: 773e5235e6
2017-04-13 22:49:11 +00:00
Adam Seaton
5f77d46693
Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 am: 2596931e86 am: cf896d4bcb am: d8dbdc0809 -s ours
...
am: a0e65c2249
2017-04-13 22:48:57 +00:00
Adam Seaton
72c26c936b
Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f am: f84d2ddb50 am: d236029c61
...
am: a34ba7f284
2017-04-13 22:43:14 +00:00
Adam Seaton
773e5235e6
[DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours am: b57f591fef am: 5e089f6be9 am: 6e52769b01
...
am: 53980e19aa
2017-04-13 22:43:09 +00:00
Adam Seaton
a0e65c2249
Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 am: 2596931e86 am: cf896d4bcb
...
am: d8dbdc0809
2017-04-13 22:42:57 +00:00
Martijn Coenen
96d62d7fb7
Add NfcNci to default builds.
...
The package won't be started if the feature is not
present on the device, but we need it for generic
builds.
Bug: 36873979
Test: marlin builds
Change-Id: Ib8110e5af00f8365f45f50b147fe5fb42f1a14e1
2017-04-13 11:13:46 -07:00
Martijn Coenen
14d363fa42
Merge "Add hwservice_contexts to default builds." into oc-dev
2017-04-13 03:34:49 +00:00
TreeHugger Robot
86d479d33e
Merge "Remove resource overlay" into oc-dev
2017-04-13 01:37:22 +00:00
Adam Seaton
a34ba7f284
Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f am: f84d2ddb50
...
am: d236029c61
2017-04-12 23:29:53 +00:00
Adam Seaton
53980e19aa
[DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours am: b57f591fef am: 5e089f6be9
...
am: 6e52769b01
2017-04-12 23:29:47 +00:00
Adam Seaton
d236029c61
Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f
...
am: f84d2ddb50
2017-04-12 23:24:22 +00:00
Adam Seaton
6e52769b01
[DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours am: b57f591fef
...
am: 5e089f6be9
2017-04-12 23:24:17 +00:00
Adam Seaton
85b7e86b2e
[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404 am: 89ebb51f6b -s ours am: 2d14a7da35 -s ours am: 2d19cbf722 am: fa8973ba33 -s ours am: 9a805d9e3e am: 47e5cb0303 am: d1174126d0 am: c4d46c791a -s ours am: 47d4a317fa am: e966226f39 am: c37c1a540d -s ours am: af6f3d396b -s ours am: f9391ddc42 -s ours am: a2bd03bf69 -s ours
...
am: 1ba1dfe6c5
2017-04-12 23:19:21 +00:00
Adam Seaton
6d66c2b356
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07 am: 386d7ae2e8 -s ours am: 4389a11f4b -s ours am: 65101a958e am: 18c3da68f0 -s ours am: 988fc368d3 am: 14ef6098bb am: a34845a20c am: a73f9cf1f5 -s ours am: 3720a2f373 am: 597a5a8b14 am: 859eeaa4ad -s ours am: 9a0ddb1332 -s ours am: f96d8a15d8 -s ours am: b81762de8d -s ours
...
am: 02f41e01cb
2017-04-12 23:19:13 +00:00
Adam Seaton
5c1507f60a
[DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev am: 70d708e29f am: 15420e5bb0 am: 49ca7ee1b0 -s ours am: 557f15a715 -s ours am: 6e77a62f7e -s ours am: f3d9b0323d -s ours
...
am: 08efc0cd6b
2017-04-12 23:18:52 +00:00
Adam Seaton
f84d2ddb50
Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9
...
am: f73b5cbd1f
2017-04-12 23:18:51 +00:00
Adam Seaton
5e089f6be9
[DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours
...
am: b57f591fef
2017-04-12 23:18:46 +00:00
Adam Seaton
3380ff6737
[DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev am: d9a5e99599 am: 518f3b9283 am: c347cb4986 -s ours am: 5958603884 -s ours am: 752ed1efb9 -s ours am: 63750aafe0 -s ours
...
am: 8dd56abe81
2017-04-12 23:18:46 +00:00
Adam Seaton
f73b5cbd1f
Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1
...
am: 724c3d4bd9
2017-04-12 23:13:21 +00:00
Adam Seaton
1ba1dfe6c5
[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404 am: 89ebb51f6b -s ours am: 2d14a7da35 -s ours am: 2d19cbf722 am: fa8973ba33 -s ours am: 9a805d9e3e am: 47e5cb0303 am: d1174126d0 am: c4d46c791a -s ours am: 47d4a317fa am: e966226f39 am: c37c1a540d -s ours am: af6f3d396b -s ours am: f9391ddc42 -s ours
...
am: a2bd03bf69
2017-04-12 23:13:20 +00:00
Adam Seaton
d8dbdc0809
Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 am: 2596931e86
...
am: cf896d4bcb
2017-04-12 23:13:16 +00:00
