OSDN Git Service
Andre Eisenbach [Mon, 16 Apr 2018 22:00:49 +0000 (15:00 -0700)]
[automerger skipped] [automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
0b036a5525 am:
96e39c15ce skipped:
0c4e21ec13 am:
4c2c4dade5 am:
2c2804d3ed am:
6d8e884c75 am:
4e7049f54b skipped:
f7d79a01d8 am:
502686433c am:
5ae2cc72fb am:
dad6e47b0f -s ours am:
1314bc8a69
am:
e586a1a373 -s ours
Change-Id: I4495885aead66190055c2ecd3c7be67631c33ebd
Andre Eisenbach [Mon, 16 Apr 2018 21:52:55 +0000 (14:52 -0700)]
[automerger skipped] [automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
1a9023fffb am:
399a1b955b am:
9be00e438f am:
6c342395e7 skipped:
ad8199c153 am:
e28b070c4f am:
38e73feb8e am:
e81eb688ea -s ours am:
d5c1d085fd
am:
649d499853 -s ours
Change-Id: I9d24085508a6d323b3d63e07147877875e27ebbb
Andre Eisenbach [Mon, 16 Apr 2018 21:22:11 +0000 (14:22 -0700)]
[automerger skipped] [automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
0b036a5525 am:
96e39c15ce skipped:
0c4e21ec13 am:
4c2c4dade5 am:
2c2804d3ed am:
6d8e884c75 am:
4e7049f54b skipped:
f7d79a01d8 am:
502686433c am:
5ae2cc72fb am:
dad6e47b0f -s ours
am:
1314bc8a69
Change-Id: I02cccade99905f0df8328e72181fa6385cc980c3
Andre Eisenbach [Mon, 16 Apr 2018 21:21:32 +0000 (14:21 -0700)]
[automerger skipped] [automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
1a9023fffb am:
399a1b955b am:
9be00e438f am:
6c342395e7 skipped:
ad8199c153 am:
e28b070c4f am:
38e73feb8e am:
e81eb688ea -s ours
am:
d5c1d085fd
Change-Id: I3a1fb5bbade6de266f904e406cc3e8beb4ab78aa
Andre Eisenbach [Mon, 16 Apr 2018 20:53:26 +0000 (13:53 -0700)]
[automerger skipped] [automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
0b036a5525 am:
96e39c15ce skipped:
0c4e21ec13 am:
4c2c4dade5 am:
2c2804d3ed am:
6d8e884c75 am:
4e7049f54b skipped:
f7d79a01d8 am:
502686433c am:
5ae2cc72fb
am:
dad6e47b0f -s ours
Change-Id: I6a126b541a4e636a225a4a37ed6bfdb0c8867378
Andre Eisenbach [Mon, 16 Apr 2018 20:48:55 +0000 (13:48 -0700)]
[automerger skipped] [automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
1a9023fffb am:
399a1b955b am:
9be00e438f am:
6c342395e7 skipped:
ad8199c153 am:
e28b070c4f am:
38e73feb8e
am:
e81eb688ea -s ours
Change-Id: I56db51e22c4593bc814213fab2f7287d3da853bb
Andre Eisenbach [Mon, 16 Apr 2018 20:26:58 +0000 (13:26 -0700)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
0b036a5525 am:
96e39c15ce skipped:
0c4e21ec13 am:
4c2c4dade5 am:
2c2804d3ed am:
6d8e884c75 am:
4e7049f54b skipped:
f7d79a01d8 am:
502686433c
am:
5ae2cc72fb
Change-Id: I480bc2813f337bd3a7e46c43350c0b5b4180c1bd
Andre Eisenbach [Mon, 16 Apr 2018 20:26:36 +0000 (13:26 -0700)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
1a9023fffb am:
399a1b955b am:
9be00e438f am:
6c342395e7 skipped:
ad8199c153 am:
e28b070c4f
am:
38e73feb8e
Change-Id: I0a4785b233684d0c286e092c5d4d707ba3294558
Andre Eisenbach [Mon, 16 Apr 2018 20:21:10 +0000 (13:21 -0700)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
0b036a5525 am:
96e39c15ce skipped:
0c4e21ec13 am:
4c2c4dade5 am:
2c2804d3ed am:
6d8e884c75 am:
4e7049f54b skipped:
f7d79a01d8
am:
502686433c
Change-Id: I787c2fa71adce021be2165ba450bd6c15f7db4eb
Andre Eisenbach [Mon, 16 Apr 2018 20:20:50 +0000 (13:20 -0700)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
1a9023fffb am:
399a1b955b am:
9be00e438f am:
6c342395e7 skipped:
ad8199c153
am:
e28b070c4f
Change-Id: If22296caf1344c4f79ded10842bca65ddb8d2530
Android Build Merger (Role) [Mon, 16 Apr 2018 20:09:03 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
0b036a5525 am:
96e39c15ce skipped:
0c4e21ec13 am:
4c2c4dade5 am:
2c2804d3ed am:
6d8e884c75 am:
4e7049f54b skipped:
f7d79a01d8
Change-Id: I07574dac78d1be4aef5a3154b2001c3cd239bad6
Android Build Merger (Role) [Mon, 16 Apr 2018 20:09:02 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
0b036a5525 am:
96e39c15ce skipped:
0c4e21ec13 am:
4c2c4dade5 am:
2c2804d3ed am:
6d8e884c75 am:
4e7049f54b
Change-Id: Ie238d797d89b25c5bf2cf6e84427773f1b76285c
Android Build Merger (Role) [Mon, 16 Apr 2018 20:09:01 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
0b036a5525 am:
96e39c15ce skipped:
0c4e21ec13 am:
4c2c4dade5 am:
2c2804d3ed am:
6d8e884c75
Change-Id: Idc6489856bef71c96be1105a058e9ce1226f90de
Android Build Merger (Role) [Mon, 16 Apr 2018 20:08:59 +0000 (20:08 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
0b036a5525 am:
96e39c15ce skipped:
0c4e21ec13 am:
4c2c4dade5 am:
2c2804d3ed
Change-Id: I9cd2497707fba6486827447412b14916f59ea92d
Android Build Merger (Role) [Mon, 16 Apr 2018 20:08:58 +0000 (20:08 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
0b036a5525 am:
96e39c15ce skipped:
0c4e21ec13 am:
4c2c4dade5
Change-Id: Iacb795d8e741d01d8c81c95657174f2fb43142c5
Android Build Merger (Role) [Mon, 16 Apr 2018 20:08:56 +0000 (20:08 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
0b036a5525 am:
96e39c15ce skipped:
0c4e21ec13
Change-Id: I3d83c500f4504773a3d9160d984ef91aeaa63d36
Android Build Merger (Role) [Mon, 16 Apr 2018 20:08:55 +0000 (20:08 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
0b036a5525 am:
96e39c15ce
Change-Id: I552dd39875722ac041979c4cce15e378cab32d5a
Android Build Merger (Role) [Mon, 16 Apr 2018 20:08:53 +0000 (20:08 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
0b036a5525
Change-Id: I855b3b72659643947a5d28f01ac37dd6ab920a4f
Andre Eisenbach [Wed, 4 Apr 2018 20:38:38 +0000 (13:38 -0700)]
DO NOT MERGE SMP: Validate remote elliptic curve points
Fixes:
72377774
Test: net_test_stack_smp (where applicable)
Change-Id: Iefcf97364493467075fadefd77d12716f71cd4f6
(cherry picked from commit
9181ec28da94705a763edbe60bd2a87e5f882beb)
Android Build Merger (Role) [Mon, 16 Apr 2018 20:08:03 +0000 (20:08 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
1a9023fffb am:
399a1b955b am:
9be00e438f am:
6c342395e7 skipped:
ad8199c153
Change-Id: If9b1cbddc778b067b12524d1785b917ae0768190
Android Build Merger (Role) [Mon, 16 Apr 2018 20:08:02 +0000 (20:08 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
1a9023fffb am:
399a1b955b am:
9be00e438f am:
6c342395e7
Change-Id: Ia2a1ae3af0bdf5c0ddd8c75be724307fa190c951
Android Build Merger (Role) [Mon, 16 Apr 2018 20:08:00 +0000 (20:08 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
1a9023fffb am:
399a1b955b am:
9be00e438f
Change-Id: I9f969320602f60bd2e33f8ec945ef6d08a6d654c
Android Build Merger (Role) [Mon, 16 Apr 2018 20:07:58 +0000 (20:07 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
1a9023fffb am:
399a1b955b
Change-Id: I7f9c21ae2b9fd334c66e3f7975289a206f8082e7
Android Build Merger (Role) [Mon, 16 Apr 2018 20:07:56 +0000 (20:07 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
1a9023fffb
Change-Id: I296f52fdb61084a34b5b9212f119570a073d5fab
Andre Eisenbach [Wed, 4 Apr 2018 20:38:38 +0000 (13:38 -0700)]
DO NOT MERGE SMP: Validate remote elliptic curve points
Fixes:
72377774
Test: net_test_stack_smp (where applicable)
Change-Id: Iefcf97364493467075fadefd77d12716f71cd4f6
(cherry picked from commit
9181ec28da94705a763edbe60bd2a87e5f882beb)
Joseph Pirozzo [Mon, 16 Apr 2018 18:50:19 +0000 (11:50 -0700)]
Merge "AVRCP controller browsing deep copy and get folder range" into pi-dev am:
f2f2fcdf74
am:
bf510c524c
Change-Id: I5dd1d9e2a0d41338bd8b377135930344e0873309
Joseph Pirozzo [Mon, 16 Apr 2018 18:24:21 +0000 (11:24 -0700)]
Merge "AVRCP controller browsing deep copy and get folder range" into pi-dev
am:
f2f2fcdf74
Change-Id: I0b90f5947d27291cd7eb4ea6431262620c2e2af9
Joseph Pirozzo [Mon, 16 Apr 2018 18:10:11 +0000 (18:10 +0000)]
Merge "AVRCP controller browsing deep copy and get folder range" into pi-dev
Andre Eisenbach [Mon, 16 Apr 2018 18:09:17 +0000 (11:09 -0700)]
[automerger skipped] [automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
accdcd94ab am:
b0f36356d8 skipped:
65bedc6768 am:
6fdcf70e9c am:
8ea0bccd78 am:
be7219b8e3 -s ours am:
b75e996889
am:
14e86ca167 -s ours
Change-Id: Ic65113d63bb414117365a978932423105da05cc4
Andre Eisenbach [Mon, 16 Apr 2018 18:06:12 +0000 (11:06 -0700)]
[automerger skipped] DO NOT MERGE SMP: Validate remote elliptic curve points skipped:
4f9ed8f66e am:
5f7f3d37bf am:
820e731205 am:
9418254b4b -s ours am:
186f4a6118
am:
350d44436a -s ours
Change-Id: I2551e1fb3ba6c9f7c294a51c76f6e236e6cbdfa4
Andre Eisenbach [Mon, 16 Apr 2018 18:00:03 +0000 (11:00 -0700)]
[automerger skipped] Merge "DO NOT MERGE SMP: Validate remote elliptic curve points" into oc-dev am:
a712452923 am:
1c9274be48 am:
0cefb24d42 -s ours am:
917ce425d4
am:
eb1e5c0089 -s ours
Change-Id: I62addd0645dff61a4502905798d9f234d57c440a
Andre Eisenbach [Mon, 16 Apr 2018 17:47:46 +0000 (10:47 -0700)]
[automerger skipped] [automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
accdcd94ab am:
b0f36356d8 skipped:
65bedc6768 am:
6fdcf70e9c am:
8ea0bccd78 am:
be7219b8e3 -s ours
am:
b75e996889
Change-Id: I2ac03648b2005175766c7e0fdba2c6bb25b518fb
Andre Eisenbach [Mon, 16 Apr 2018 17:46:22 +0000 (10:46 -0700)]
[automerger skipped] DO NOT MERGE SMP: Validate remote elliptic curve points skipped:
4f9ed8f66e am:
5f7f3d37bf am:
820e731205 am:
9418254b4b -s ours
am:
186f4a6118
Change-Id: I95cc85f26a2883461a60448289c2e0e4b521e550
Andre Eisenbach [Mon, 16 Apr 2018 17:40:12 +0000 (10:40 -0700)]
[automerger skipped] Merge "DO NOT MERGE SMP: Validate remote elliptic curve points" into oc-dev am:
a712452923 am:
1c9274be48 am:
0cefb24d42 -s ours
am:
917ce425d4
Change-Id: I4ddd815134e20c811cab9607ebee96573e19a1a3
Andre Eisenbach [Mon, 16 Apr 2018 17:04:10 +0000 (10:04 -0700)]
[automerger skipped] [automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
accdcd94ab am:
b0f36356d8 skipped:
65bedc6768 am:
6fdcf70e9c am:
8ea0bccd78
am:
be7219b8e3 -s ours
Change-Id: I3c1f1c7ecb4d398afe34d2b2a4b37505d8084bfb
Andre Eisenbach [Mon, 16 Apr 2018 17:03:58 +0000 (10:03 -0700)]
[automerger skipped] DO NOT MERGE SMP: Validate remote elliptic curve points skipped:
4f9ed8f66e am:
5f7f3d37bf am:
820e731205
am:
9418254b4b -s ours
Change-Id: I38dda55bda57ea3458823964f85522b9a06f1b9e
Andre Eisenbach [Mon, 16 Apr 2018 17:03:43 +0000 (10:03 -0700)]
[automerger skipped] Merge "DO NOT MERGE SMP: Validate remote elliptic curve points" into oc-dev am:
a712452923 am:
1c9274be48
am:
0cefb24d42 -s ours
Change-Id: Ie94b8a293a25e5cea84845fd68ca6df4962ab04c
Andre Eisenbach [Mon, 16 Apr 2018 16:59:56 +0000 (09:59 -0700)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
accdcd94ab am:
b0f36356d8 skipped:
65bedc6768 am:
6fdcf70e9c
am:
8ea0bccd78
Change-Id: Ie1a4a1b93c6f2797c0cabb8db522a62aa6678d19
Andre Eisenbach [Mon, 16 Apr 2018 16:59:38 +0000 (09:59 -0700)]
[automerger skipped] DO NOT MERGE SMP: Validate remote elliptic curve points skipped:
4f9ed8f66e am:
5f7f3d37bf
am:
820e731205
Change-Id: I1d6c100ffc82c04a333de60e75dc16920e5b19fc
Andre Eisenbach [Mon, 16 Apr 2018 16:59:16 +0000 (09:59 -0700)]
Merge "DO NOT MERGE SMP: Validate remote elliptic curve points" into oc-dev am:
a712452923
am:
1c9274be48
Change-Id: Ida7f1395569973f1acf2a01b61da6fa624005081
Andre Eisenbach [Mon, 16 Apr 2018 16:56:55 +0000 (09:56 -0700)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
accdcd94ab am:
b0f36356d8 skipped:
65bedc6768
am:
6fdcf70e9c
Change-Id: Ie9774b0825379aed74243ab225fb925029273f11
Andre Eisenbach [Mon, 16 Apr 2018 16:56:35 +0000 (09:56 -0700)]
[automerger skipped] DO NOT MERGE SMP: Validate remote elliptic curve points skipped:
4f9ed8f66e
am:
5f7f3d37bf
Change-Id: I5c7467968af58cc3e604b6b7df3d53c61696b116
Andre Eisenbach [Mon, 16 Apr 2018 16:56:15 +0000 (09:56 -0700)]
Merge "DO NOT MERGE SMP: Validate remote elliptic curve points" into oc-dev
am:
a712452923
Change-Id: I959b5d799ad27ba1b03ab578fbdfecbc0edb5cd6
Android Build Merger (Role) [Mon, 16 Apr 2018 16:50:33 +0000 (16:50 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
accdcd94ab am:
b0f36356d8 skipped:
65bedc6768
Change-Id: If98fd8b677ee7038d8dda5f78cfc56371ba4f400
Android Build Merger (Role) [Mon, 16 Apr 2018 16:50:30 +0000 (16:50 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
accdcd94ab am:
b0f36356d8
Change-Id: I8e07c755fa727dbf746395be50271eac5c57a79c
Android Build Merger (Role) [Mon, 16 Apr 2018 16:50:28 +0000 (16:50 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
accdcd94ab
Change-Id: I7efc9d1806c1c848220ec6dd18dd2d1848f1158f
Andre Eisenbach [Wed, 4 Apr 2018 20:38:38 +0000 (13:38 -0700)]
DO NOT MERGE SMP: Validate remote elliptic curve points
Fixes:
72377774
Test: net_test_stack_smp (where applicable)
Change-Id: Iefcf97364493467075fadefd77d12716f71cd4f6
(cherry picked from commit
9181ec28da94705a763edbe60bd2a87e5f882beb)
Android Build Merger (Role) [Mon, 16 Apr 2018 16:49:55 +0000 (16:49 +0000)]
[automerger skipped] DO NOT MERGE SMP: Validate remote elliptic curve points skipped:
4f9ed8f66e
Change-Id: I44071ce2348cc328f417b5a30bd290de49c3e474
Andre Eisenbach [Wed, 4 Apr 2018 20:38:38 +0000 (13:38 -0700)]
DO NOT MERGE SMP: Validate remote elliptic curve points
Fixes:
72377774
Test: net_test_stack_smp (where applicable)
Change-Id: Iefcf97364493467075fadefd77d12716f71cd4f6
(cherry picked from commit
9181ec28da94705a763edbe60bd2a87e5f882beb)
Andre Eisenbach [Mon, 16 Apr 2018 16:49:25 +0000 (16:49 +0000)]
Merge "DO NOT MERGE SMP: Validate remote elliptic curve points" into oc-dev
Ian Pedowitz [Sun, 15 Apr 2018 03:13:25 +0000 (20:13 -0700)]
Merge "Remove bsears/ijpedowitz from system/bt OWNERS" into oc-dev am:
02e7972fff am:
cce92c4ef6 am:
1c8b37f57f am:
8b71f16aa7
am:
f0ad259055
Change-Id: Ib35620d012568d47c50f4c890652f8ee9550a9c0
Ian Pedowitz [Sun, 15 Apr 2018 02:53:09 +0000 (19:53 -0700)]
Merge "Remove bsears/ijpedowitz from system/bt OWNERS" into oc-dev am:
02e7972fff am:
cce92c4ef6 am:
1c8b37f57f
am:
8b71f16aa7
Change-Id: Ib547f34a94a1832f999bb1be5fc27f328d2d176e
Ajay Panicker [Sat, 14 Apr 2018 23:24:31 +0000 (16:24 -0700)]
Merge changes from topic "am-
175db33b-0d30-4b99-87fe-
9ef5c15643d6" into oc-dev am:
3752a74245 am:
bea60140d5 am:
6e1f7441f7 am:
1b595cb80c
am:
2df73b87cf
Change-Id: I337ddcdb6e0955fcd8219d2218b4bc557f8217e3
Ian Pedowitz [Sat, 14 Apr 2018 22:55:23 +0000 (15:55 -0700)]
Merge "Remove bsears/ijpedowitz from system/bt OWNERS" into oc-dev am:
02e7972fff am:
cce92c4ef6
am:
1c8b37f57f
Change-Id: I3338d7c94900a70a7066f5cc410ad0f002fc2c65
Ian Pedowitz [Sat, 14 Apr 2018 22:40:13 +0000 (15:40 -0700)]
Merge "Remove bsears/ijpedowitz from system/bt OWNERS" into oc-dev am:
02e7972fff
am:
cce92c4ef6
Change-Id: Ieb97aa2df69ef785e69c2b756d56a8da54b6eebf
Ian Pedowitz [Fri, 13 Apr 2018 21:43:49 +0000 (14:43 -0700)]
Merge "Remove bsears/ijpedowitz from system/bt OWNERS" into oc-dev
am:
02e7972fff
Change-Id: I48f85ba534045591f7ae5ac636d40b0ad48e8778
Ajay Panicker [Fri, 13 Apr 2018 21:34:08 +0000 (14:34 -0700)]
Merge changes from topic "am-
175db33b-0d30-4b99-87fe-
9ef5c15643d6" into oc-dev am:
3752a74245 am:
bea60140d5 am:
6e1f7441f7
am:
1b595cb80c
Change-Id: Ib7e007ba5430a6962228dff9df4bb3f77f8e1df2
TreeHugger Robot [Fri, 13 Apr 2018 21:31:06 +0000 (21:31 +0000)]
Merge "Remove bsears/ijpedowitz from system/bt OWNERS" into oc-dev
Ajay Panicker [Fri, 13 Apr 2018 20:59:09 +0000 (13:59 -0700)]
Merge changes from topic "am-
175db33b-0d30-4b99-87fe-
9ef5c15643d6" into oc-dev am:
3752a74245 am:
bea60140d5
am:
6e1f7441f7
Change-Id: Ib5a9aecfeaa87431b57f2b2616c4548395bd4419
Ajay Panicker [Fri, 13 Apr 2018 20:48:41 +0000 (13:48 -0700)]
Merge changes from topic "am-
175db33b-0d30-4b99-87fe-
9ef5c15643d6" into oc-dev am:
3752a74245
am:
bea60140d5
Change-Id: I2dab6069525413f1d6365c7ce7affe8587afcbe4
Hansong Zhang [Fri, 13 Apr 2018 20:41:38 +0000 (13:41 -0700)]
Merge "Fix OOB read in process_l2cap_cmd" into pi-dev am:
e3d595f2d3
am:
4ce8082d46
Change-Id: Ifb72618cba4adde9b0a3557555e8557b8d04f1ec
Ajay Panicker [Fri, 13 Apr 2018 20:41:05 +0000 (13:41 -0700)]
Merge changes from topic "am-
175db33b-0d30-4b99-87fe-
9ef5c15643d6" into oc-dev
am:
3752a74245
Change-Id: Ife4fbd0a17a6e9b861f4a3c8ee202e7d176b0825
Hansong Zhang [Fri, 13 Apr 2018 20:30:12 +0000 (13:30 -0700)]
Merge "Fix OOB read in process_l2cap_cmd" into pi-dev
am:
e3d595f2d3
Change-Id: If55dcf5f859b553e3497bcd98a069d440c2c0292
TreeHugger Robot [Fri, 13 Apr 2018 20:29:14 +0000 (20:29 +0000)]
Merge changes from topic "am-
175db33b-0d30-4b99-87fe-
9ef5c15643d6" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ am:
a75ccdc7ee
DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ
TreeHugger Robot [Fri, 13 Apr 2018 20:29:14 +0000 (20:29 +0000)]
Merge "DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ" into nyc-dev
TreeHugger Robot [Fri, 13 Apr 2018 20:29:14 +0000 (20:29 +0000)]
Merge changes from topic "am-
175db33b-0d30-4b99-87fe-
9ef5c15643d6" into cw-f-dev
* changes:
[automerger] DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ am:
a75ccdc7ee am:
049e0c62c9 skipped:
72eb87a7c9
[automerger] DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ am:
a75ccdc7ee am:
049e0c62c9
[automerger] DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ am:
a75ccdc7ee
DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ
TreeHugger Robot [Fri, 13 Apr 2018 20:29:14 +0000 (20:29 +0000)]
Merge changes from topic "am-
175db33b-0d30-4b99-87fe-
9ef5c15643d6" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ am:
a75ccdc7ee am:
049e0c62c9
[automerger] DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ am:
a75ccdc7ee
DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ
TreeHugger Robot [Fri, 13 Apr 2018 20:29:14 +0000 (20:29 +0000)]
Merge changes from topic "am-
175db33b-0d30-4b99-87fe-
9ef5c15643d6" into nyc-mr2-dev
* changes:
[automerger] DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ am:
a75ccdc7ee am:
049e0c62c9 skipped:
72eb87a7c9 am:
66cf5dda11
[automerger] DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ am:
a75ccdc7ee am:
049e0c62c9 skipped:
72eb87a7c9
[automerger] DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ am:
a75ccdc7ee am:
049e0c62c9
[automerger] DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ am:
a75ccdc7ee
DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ
TreeHugger Robot [Fri, 13 Apr 2018 20:29:14 +0000 (20:29 +0000)]
Merge changes from topic "am-
175db33b-0d30-4b99-87fe-
9ef5c15643d6" into oc-dev
* changes:
[automerger] DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ am:
a75ccdc7ee am:
049e0c62c9 skipped:
72eb87a7c9 am:
66cf5dda11 skipped:
c2dff60c3a
[automerger] DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ am:
a75ccdc7ee am:
049e0c62c9 skipped:
72eb87a7c9 am:
66cf5dda11
[automerger] DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ am:
a75ccdc7ee am:
049e0c62c9 skipped:
72eb87a7c9
[automerger] DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ am:
a75ccdc7ee am:
049e0c62c9
[automerger] DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ am:
a75ccdc7ee
DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ
TreeHugger Robot [Fri, 13 Apr 2018 20:00:11 +0000 (20:00 +0000)]
Merge "Fix OOB read in process_l2cap_cmd" into pi-dev
Hansong Zhang [Fri, 13 Apr 2018 19:52:47 +0000 (12:52 -0700)]
[automerger skipped] Merge "DO NOT MERGE Add bounds check for BNEP_Write" into oc-dev am:
75dea4c637 am:
c39740079b am:
1bd5790f72 -s ours am:
e0355b229b
am:
e7328b349e -s ours
Change-Id: I4707ac8480e21c577de07b83e98fd08b367047f6
Hansong Zhang [Fri, 13 Apr 2018 19:52:31 +0000 (12:52 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix OOB read in process_l2cap_cmd" into oc-dev am:
2714b8175f am:
e325dab311 am:
dfa7917f71 -s ours am:
5fa2274d3b
am:
8188e7f1d8 -s ours
Change-Id: I5ffcab9d56fdfd320599c65cdb7febe5857f9a4e
Hansong Zhang [Fri, 13 Apr 2018 19:52:16 +0000 (12:52 -0700)]
[automerger skipped] Merge "DO NOT MERGE Initialize local variable in gatts_process_read_by_type_req" into oc-mr1-dev am:
7bee4b48be -s ours am:
b8d562a294
am:
9ef56e5d5b -s ours
Change-Id: Iad16dce676688c21d510d2cfb59839b6514fe909
Hansong Zhang [Fri, 13 Apr 2018 19:51:59 +0000 (12:51 -0700)]
Merge changes from topic "am-
4f00fbdf-3978-4c02-91d3-
d55eeb01b9a9-mnc-dev" into oc-dev am:
d9f2106a62 am:
1627df6736 am:
c45fb1ea3a am:
18ff936eed
am:
d3dde47fd5
Change-Id: Id81c233e87b1700f711886fe6e149bee6d2c745b
Hansong Zhang [Fri, 13 Apr 2018 19:51:26 +0000 (12:51 -0700)]
Merge changes from topic "am-
4f00fbdf-3978-4c02-91d3-
d55eeb01b9a9" into oc-dev am:
853d6267e1 am:
e6057078f7 am:
3e2c5ef3d4 am:
a9614ccac3
am:
e4ed9840f7
Change-Id: I07dac8ded8be7433cc762dd604badf502a0fffd2
Hansong Zhang [Fri, 13 Apr 2018 19:50:56 +0000 (12:50 -0700)]
Merge "Add bounds check for BNEP_Write" into pi-dev am:
6b2d02b7ea
am:
1ff4d8dc91
Change-Id: If09cccbb0a96fab203338499b80f817138fb861f
Hansong Zhang [Fri, 13 Apr 2018 19:50:13 +0000 (12:50 -0700)]
Merge "Initialize local variable in gatts_process_read_by_type_req" into pi-dev am:
4bd1bf3be8
am:
4b6e9a0b3f
Change-Id: I02153001e626b8884719d67d9537dc7f6cf7a438
Hansong Zhang [Fri, 13 Apr 2018 19:49:10 +0000 (12:49 -0700)]
Merge changes from topic "am-
95b770cf-713e-4c26-a12d-
ca284eb0fbd7" into oc-dev am:
ca2db5620d am:
05a3ab6e80 am:
79a34c4d18 am:
86fd602084
am:
c5308425b2
Change-Id: Ifdc4f53579bc9b76efb54432fb012ab85aa51ac5
Hansong Zhang [Fri, 13 Apr 2018 19:43:31 +0000 (12:43 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
769aeaaf44 am:
43f68c1ebe am:
b4cc558dd1 am:
b132411206 skipped:
008dd0e5ac am:
167165f72a am:
da1f87776d am:
8634a90de6 -s ours am:
edec95f69b
am:
24d167650c -s ours
Change-Id: I38a1fafb9dcbf69a96ecc5257e7b81fda43100b4
Hansong Zhang [Fri, 13 Apr 2018 19:16:36 +0000 (12:16 -0700)]
[automerger skipped] Merge "DO NOT MERGE Add bounds check for BNEP_Write" into oc-dev am:
75dea4c637 am:
c39740079b am:
1bd5790f72 -s ours
am:
e0355b229b
Change-Id: I5a3b37ce4db32d45ebdc1fd6056463ea5b370543
Hansong Zhang [Fri, 13 Apr 2018 19:15:38 +0000 (12:15 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix OOB read in process_l2cap_cmd" into oc-dev am:
2714b8175f am:
e325dab311 am:
dfa7917f71 -s ours
am:
5fa2274d3b
Change-Id: Idb3289591e808ba17d03c164a0e81d5374bf13fe
Hansong Zhang [Fri, 13 Apr 2018 19:15:10 +0000 (12:15 -0700)]
[automerger skipped] Merge "DO NOT MERGE Initialize local variable in gatts_process_read_by_type_req" into oc-mr1-dev am:
7bee4b48be -s ours
am:
b8d562a294
Change-Id: I39ddc92c36258f1d055166afb0274529053e2521
Hansong Zhang [Fri, 13 Apr 2018 19:14:44 +0000 (12:14 -0700)]
Merge changes from topic "am-
4f00fbdf-3978-4c02-91d3-
d55eeb01b9a9-mnc-dev" into oc-dev am:
d9f2106a62 am:
1627df6736 am:
c45fb1ea3a
am:
18ff936eed
Change-Id: I499b7a03f32a83ba11753ed0a1826d424c85667f
Hansong Zhang [Fri, 13 Apr 2018 19:14:00 +0000 (12:14 -0700)]
Merge changes from topic "am-
4f00fbdf-3978-4c02-91d3-
d55eeb01b9a9" into oc-dev am:
853d6267e1 am:
e6057078f7 am:
3e2c5ef3d4
am:
a9614ccac3
Change-Id: Iab086badebd2342b2096e2ac79d18fbc05989e85
Hansong Zhang [Fri, 13 Apr 2018 19:12:54 +0000 (12:12 -0700)]
Merge "Add bounds check for BNEP_Write" into pi-dev
am:
6b2d02b7ea
Change-Id: I9d8398b000f56abc6f0d9a6707ffcdb701a56002
Hansong Zhang [Fri, 13 Apr 2018 19:09:35 +0000 (12:09 -0700)]
Merge "Initialize local variable in gatts_process_read_by_type_req" into pi-dev
am:
4bd1bf3be8
Change-Id: I46b9c881b6f281445d001d876314e416b28492eb
Ian Pedowitz [Fri, 13 Apr 2018 18:58:08 +0000 (11:58 -0700)]
Remove bsears/ijpedowitz from system/bt OWNERS
We now have Build Cop Override
Fixes:
78017465
Test: N/A
Change-Id: I7feff1c76927a2a454cbe33c99a5a40fc8d96ee6
Hansong Zhang [Fri, 13 Apr 2018 18:57:57 +0000 (11:57 -0700)]
[automerger skipped] Merge "DO NOT MERGE Add bounds check for BNEP_Write" into oc-dev am:
75dea4c637 am:
c39740079b
am:
1bd5790f72 -s ours
Change-Id: I98e64840db2528f5bd1240a97f974612466a3f96
Hansong Zhang [Fri, 13 Apr 2018 18:57:42 +0000 (11:57 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix OOB read in process_l2cap_cmd" into oc-dev am:
2714b8175f am:
e325dab311
am:
dfa7917f71 -s ours
Change-Id: Ia7930985dc382c8d9533af4c16a5329f611d0d0c
Hansong Zhang [Fri, 13 Apr 2018 18:56:22 +0000 (11:56 -0700)]
Merge changes from topic "am-
95b770cf-713e-4c26-a12d-
ca284eb0fbd7" into oc-dev am:
ca2db5620d am:
05a3ab6e80 am:
79a34c4d18
am:
86fd602084
Change-Id: I1ab5442fdc8a96e950488061a9a1e0de0815d830
Hansong Zhang [Fri, 13 Apr 2018 18:52:06 +0000 (11:52 -0700)]
Merge "DO NOT MERGE Add bounds check for BNEP_Write" into oc-dev am:
75dea4c637
am:
c39740079b
Change-Id: Id127181f5dde16c0121fe4b307ecca9f69ad48ca
Hansong Zhang [Fri, 13 Apr 2018 18:51:44 +0000 (11:51 -0700)]
Merge "DO NOT MERGE Fix OOB read in process_l2cap_cmd" into oc-dev am:
2714b8175f
am:
e325dab311
Change-Id: Id806df37d02288e4062bdfc29a402e4933a7cfbc
Hansong Zhang [Fri, 13 Apr 2018 18:47:35 +0000 (11:47 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
769aeaaf44 am:
43f68c1ebe am:
b4cc558dd1 am:
b132411206 skipped:
008dd0e5ac am:
167165f72a am:
da1f87776d am:
8634a90de6 -s ours
am:
edec95f69b
Change-Id: I4c90cbdf39d9082d0d63cbeba65ad43737b5dbea
Hansong Zhang [Fri, 13 Apr 2018 18:46:40 +0000 (11:46 -0700)]
Merge "DO NOT MERGE Add bounds check for BNEP_Write" into oc-dev
am:
75dea4c637
Change-Id: I79386fb3e152492d31e2cee4181cd168b9c2cccf
Hansong Zhang [Fri, 13 Apr 2018 18:46:17 +0000 (11:46 -0700)]
Merge "DO NOT MERGE Fix OOB read in process_l2cap_cmd" into oc-dev
am:
2714b8175f
Change-Id: I6f98b5f541a6466ecdf166e199e310bfc012170d
Hansong Zhang [Fri, 13 Apr 2018 18:39:30 +0000 (11:39 -0700)]
[automerger skipped] Merge "DO NOT MERGE Initialize local variable in gatts_process_read_by_type_req" into oc-mr1-dev
am:
7bee4b48be -s ours
Change-Id: I4065b8e2dbc73e84633b0812cbda411c76740aff
Hansong Zhang [Fri, 13 Apr 2018 18:39:18 +0000 (11:39 -0700)]
Merge changes from topic "am-
4f00fbdf-3978-4c02-91d3-
d55eeb01b9a9-mnc-dev" into oc-dev am:
d9f2106a62 am:
1627df6736
am:
c45fb1ea3a
Change-Id: Ica788159063524b5704aeac9a8d9694451fd63be
Hansong Zhang [Fri, 13 Apr 2018 18:38:48 +0000 (11:38 -0700)]
Merge changes from topic "am-
4f00fbdf-3978-4c02-91d3-
d55eeb01b9a9" into oc-dev am:
853d6267e1 am:
e6057078f7
am:
3e2c5ef3d4
Change-Id: I5fadd5a2450b39fceba5d6032179e89528635ec6
TreeHugger Robot [Fri, 13 Apr 2018 18:34:52 +0000 (18:34 +0000)]
Merge "Add bounds check for BNEP_Write" into pi-dev
TreeHugger Robot [Fri, 13 Apr 2018 18:34:30 +0000 (18:34 +0000)]
Merge "Initialize local variable in gatts_process_read_by_type_req" into pi-dev
OSDN Git Service
