OSDN Git Service
Jaewan Kim [Thu, 22 Sep 2016 10:59:39 +0000 (10:59 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
4e9af38ec4 -s ours am:
031fb04776 am:
2d88f87a82 am:
64110c6bf1 -s ours am:
8d14f464b5 am:
f595add2ff am:
e1e6f0a7f5
am:
9632afe809 -s ours
Change-Id: I68e31867b8c925717eda87a426add614f731f77a
Jaewan Kim [Thu, 22 Sep 2016 10:58:44 +0000 (10:58 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev am:
162c80bf0c am:
e47b5adce2 am:
bea0b3ec06 -s ours am:
91ccfa1def am:
4167620d33 am:
2c9ad0ff81
am:
b6d6519e34 -s ours
Change-Id: Idda087e0cbccf3e94dd23a41156cdcc14a4b2459
Jaewan Kim [Thu, 22 Sep 2016 10:57:53 +0000 (10:57 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
6a1567c267 am:
709d112eca am:
6bf115121c -s ours am:
30d1440861 am:
ba1d8300be am:
016d110993
am:
1adff2ee05 -s ours
Change-Id: I99f14369c3f5f4388a17b85720a45bde8ee4c5be
Ajay Panicker [Thu, 22 Sep 2016 10:56:50 +0000 (10:56 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev am:
f78ff48d0d -s ours am:
7cd1668893 am:
a5e128ba97 am:
94c08c2bed -s ours am:
d4fe288933 am:
f65661939b am:
630d577349
am:
c9830d56e5 -s ours
Change-Id: Iaae899eeea3c9c95ebcd7654e6fb5a89d7f1ed90
Ajay Panicker [Thu, 22 Sep 2016 10:55:43 +0000 (10:55 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
27b3d578b9 -s ours am:
57fdbb97a6 am:
2cf025f976 am:
9c7ac98157 -s ours am:
1448a693d8 am:
3d4c737736 am:
f6d8037708
am:
90eafb5322 -s ours
Change-Id: I21edab5680d1cc4f5afa74ab9764f0ff945a44cc
Ajay Panicker [Thu, 22 Sep 2016 10:54:53 +0000 (10:54 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev am:
447ac4b31d am:
4431d6cb5b am:
852e5a43b9 -s ours am:
a70fffe8e7 am:
d677e8d413 am:
73607db5a1
am:
05cd9942d9 -s ours
Change-Id: Iedd8920de15034413968efa125fa544b5a25e87c
Ajay Panicker [Thu, 22 Sep 2016 10:53:39 +0000 (10:53 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
85bc33a8f4 am:
46442d1be1 am:
8be4dc7e16 -s ours am:
c56c079470 am:
1783182332 am:
993015ce9a
am:
8e172c638d -s ours
Change-Id: I6ed9ac6f79a853f08fbc3105cade0d47033701f0
Jaewan Kim [Thu, 22 Sep 2016 10:52:37 +0000 (10:52 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev am:
22c9458a13 am:
78fa55e261 am:
b2403f3102
am:
5decf8e715 -s ours
Change-Id: I79036440c10f32b4a30fbefa3a3ff65ebd9fc69e
Jaewan Kim [Thu, 22 Sep 2016 09:38:13 +0000 (09:38 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
4e9af38ec4 -s ours am:
031fb04776 am:
2d88f87a82 am:
64110c6bf1 -s ours am:
8d14f464b5 am:
f595add2ff
am:
e1e6f0a7f5
Change-Id: I373b66ee022f14d331729531c450eb18f8572d9b
Jaewan Kim [Thu, 22 Sep 2016 09:14:33 +0000 (09:14 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev am:
162c80bf0c am:
e47b5adce2 am:
bea0b3ec06 -s ours am:
91ccfa1def am:
4167620d33
am:
2c9ad0ff81
Change-Id: I57e8a4e6b415683cba317afa012880b8ac12bff6
Jaewan Kim [Thu, 22 Sep 2016 09:13:26 +0000 (09:13 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
6a1567c267 am:
709d112eca am:
6bf115121c -s ours am:
30d1440861 am:
ba1d8300be
am:
016d110993
Change-Id: I6a216c2e2ddb6b9959e9691c5014c0d29b6c453d
Jaewan Kim [Thu, 22 Sep 2016 09:13:16 +0000 (09:13 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
4e9af38ec4 -s ours am:
031fb04776 am:
2d88f87a82 am:
64110c6bf1 -s ours am:
8d14f464b5
am:
f595add2ff
Change-Id: I9d7b96411a566e6fa4ad4c8d263140245b427b44
Jaewan Kim [Thu, 22 Sep 2016 08:45:03 +0000 (08:45 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
4e9af38ec4 -s ours am:
031fb04776 am:
2d88f87a82 am:
64110c6bf1 -s ours
am:
8d14f464b5
Change-Id: Id6f3783a23706efaa7f389deb84e69c69fab501a
Jaewan Kim [Thu, 22 Sep 2016 08:08:16 +0000 (08:08 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev am:
162c80bf0c am:
e47b5adce2 am:
bea0b3ec06 -s ours am:
91ccfa1def
am:
4167620d33
Change-Id: I1af888ef60ff3920e1b63a421e432319bdefdb3e
Jaewan Kim [Thu, 22 Sep 2016 08:07:35 +0000 (08:07 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
c282c4f106 am:
868d586c98 am:
ff1c1993b7
am:
35e95d82d7 -s ours
Change-Id: I5fe98000c623199706bd3879a361ef72e0da2ccb
Jaewan Kim [Thu, 22 Sep 2016 08:07:15 +0000 (08:07 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
6a1567c267 am:
709d112eca am:
6bf115121c -s ours am:
30d1440861
am:
ba1d8300be
Change-Id: I198e4b87bed7f0b4e253e86a89fa5c36fec1fbb2
Jaewan Kim [Thu, 22 Sep 2016 08:05:11 +0000 (08:05 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
4e9af38ec4 -s ours am:
031fb04776 am:
2d88f87a82
am:
64110c6bf1 -s ours
Change-Id: I69062cb6535df22a743270a62fda89dcca155e87
Ajay Panicker [Thu, 22 Sep 2016 07:39:22 +0000 (07:39 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev am:
f78ff48d0d -s ours am:
7cd1668893 am:
a5e128ba97 am:
94c08c2bed -s ours am:
d4fe288933 am:
f65661939b
am:
630d577349
Change-Id: I812cd00912fad74e9f07a6881bec4b93e6e71490
Ajay Panicker [Thu, 22 Sep 2016 07:38:34 +0000 (07:38 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
27b3d578b9 -s ours am:
57fdbb97a6 am:
2cf025f976 am:
9c7ac98157 -s ours am:
1448a693d8 am:
3d4c737736
am:
f6d8037708
Change-Id: Iec857815b52d8b0bdfdd1b14210fa67bc3a17c83
Ajay Panicker [Thu, 22 Sep 2016 07:37:44 +0000 (07:37 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev am:
447ac4b31d am:
4431d6cb5b am:
852e5a43b9 -s ours am:
a70fffe8e7 am:
d677e8d413
am:
73607db5a1
Change-Id: I0fbfd3aac6e4d6e6090bfcde65abc8f5641cfe5e
Ajay Panicker [Thu, 22 Sep 2016 07:36:50 +0000 (07:36 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
85bc33a8f4 am:
46442d1be1 am:
8be4dc7e16 -s ours am:
c56c079470 am:
1783182332
am:
993015ce9a
Change-Id: I19514d41db780f41114fe05e86360beeda44352b
Jaewan Kim [Thu, 22 Sep 2016 07:35:45 +0000 (07:35 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev am:
22c9458a13 am:
78fa55e261
am:
b2403f3102
Change-Id: Ia418a5eb08b7f5cdb2a987c4f17708069012c0e5
Jaewan Kim [Thu, 22 Sep 2016 07:34:55 +0000 (07:34 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
c282c4f106 am:
868d586c98
am:
ff1c1993b7
Change-Id: I60355987ea0814314c2f79041d068e099b158c7b
Jaewan Kim [Thu, 22 Sep 2016 06:40:05 +0000 (06:40 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
4e9af38ec4 -s ours am:
031fb04776
am:
2d88f87a82
Change-Id: Idd9cdf4bb14b4feced73ea176f3505ae02d630e7
Ajay Panicker [Thu, 22 Sep 2016 04:58:44 +0000 (04:58 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev am:
f78ff48d0d -s ours am:
7cd1668893 am:
a5e128ba97 am:
94c08c2bed -s ours am:
d4fe288933
am:
f65661939b
Change-Id: I05d4bdc92834197058c77ae31113c9783b558d8e
Ajay Panicker [Thu, 22 Sep 2016 04:57:53 +0000 (04:57 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
27b3d578b9 -s ours am:
57fdbb97a6 am:
2cf025f976 am:
9c7ac98157 -s ours am:
1448a693d8
am:
3d4c737736
Change-Id: Ic23e1121dda4b85e5064c8d47a142da41617f321
Ajay Panicker [Thu, 22 Sep 2016 04:57:01 +0000 (04:57 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev am:
447ac4b31d am:
4431d6cb5b am:
852e5a43b9 -s ours am:
a70fffe8e7
am:
d677e8d413
Change-Id: Ib333fdba81a5c339bc9b55fa3055a73a3b6042a7
Ajay Panicker [Thu, 22 Sep 2016 04:56:04 +0000 (04:56 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
85bc33a8f4 am:
46442d1be1 am:
8be4dc7e16 -s ours am:
c56c079470
am:
1783182332
Change-Id: Ia62f75205e5d8406249991175fc5cf66d1f2bdb9
Jaewan Kim [Thu, 22 Sep 2016 04:55:18 +0000 (04:55 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev am:
22c9458a13
am:
78fa55e261
Change-Id: I81587010e753fd1f23a530c973675fe0790b8b33
Jaewan Kim [Thu, 22 Sep 2016 04:54:25 +0000 (04:54 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
c282c4f106
am:
868d586c98
Change-Id: Icc7c4e12e75f5b27c41866fcb8d8553fcffd90ab
Jaewan Kim [Thu, 22 Sep 2016 04:29:59 +0000 (04:29 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev am:
162c80bf0c am:
e47b5adce2 am:
bea0b3ec06 -s ours
am:
91ccfa1def
Change-Id: I9f76004fe1ef3b54b187414281874f34e2ff4dc8
Jaewan Kim [Thu, 22 Sep 2016 04:29:01 +0000 (04:29 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
6a1567c267 am:
709d112eca am:
6bf115121c -s ours
am:
30d1440861
Change-Id: I000e899b41a1a88a2d68a3d554b3d2f6045aa0d2
Ajay Panicker [Thu, 22 Sep 2016 03:49:50 +0000 (03:49 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev am:
f78ff48d0d -s ours am:
7cd1668893 am:
a5e128ba97 am:
94c08c2bed -s ours
am:
d4fe288933
Change-Id: Ie0629a3b6f4c5fd8166bb060673606878f00bef8
Ajay Panicker [Thu, 22 Sep 2016 03:48:56 +0000 (03:48 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
27b3d578b9 -s ours am:
57fdbb97a6 am:
2cf025f976 am:
9c7ac98157 -s ours
am:
1448a693d8
Change-Id: I8693bc42cd9ff46f6b0c56db49a5c467b3ab4af0
Jaewan Kim [Thu, 22 Sep 2016 03:48:37 +0000 (03:48 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev am:
162c80bf0c am:
e47b5adce2
am:
bea0b3ec06 -s ours
Change-Id: Ic367544242a4034b66f03568eb7d1035f90836dd
Ajay Panicker [Thu, 22 Sep 2016 03:47:58 +0000 (03:47 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev am:
447ac4b31d am:
4431d6cb5b am:
852e5a43b9 -s ours
am:
a70fffe8e7
Change-Id: Id42caaa08c4e933cf0d08bfe7c8271f2cdd40c76
Jaewan Kim [Thu, 22 Sep 2016 03:47:42 +0000 (03:47 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
6a1567c267 am:
709d112eca
am:
6bf115121c -s ours
Change-Id: Ic25670f851a72e8be2b028016ac4515c8977d349
Ajay Panicker [Thu, 22 Sep 2016 03:47:01 +0000 (03:47 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
85bc33a8f4 am:
46442d1be1 am:
8be4dc7e16 -s ours
am:
c56c079470
Change-Id: Ie03995ef39bce15b5279ff78ef23e94401eab9db
Jaewan Kim [Thu, 22 Sep 2016 03:23:14 +0000 (03:23 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev am:
162c80bf0c
am:
e47b5adce2
Change-Id: Ie35fa2ebffc5f5369b1473f78c0bfeb38fdfc5ca
Jaewan Kim [Thu, 22 Sep 2016 03:22:18 +0000 (03:22 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
6a1567c267
am:
709d112eca
Change-Id: Ic112856078e6b3c0bd4e6e2442457c3be035a253
Jaewan Kim [Thu, 22 Sep 2016 02:54:22 +0000 (02:54 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
4e9af38ec4 -s ours
am:
031fb04776
Change-Id: I05beb9fff4527be83812122be9d783c9a109cb01
Elliot Waite [Thu, 22 Sep 2016 02:19:41 +0000 (02:19 +0000)]
Merge "Revert fixed at links." into nyc-dev
Ajay Panicker [Thu, 22 Sep 2016 01:37:37 +0000 (01:37 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev am:
f78ff48d0d -s ours am:
7cd1668893 am:
a5e128ba97
am:
94c08c2bed -s ours
Change-Id: I92cf4d41b8adae4021b9a2eaf99f56015c995148
Ajay Panicker [Thu, 22 Sep 2016 01:36:41 +0000 (01:36 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
27b3d578b9 -s ours am:
57fdbb97a6 am:
2cf025f976
am:
9c7ac98157 -s ours
Change-Id: I3bc0085154ca14e3bee294de6109e41e1ccd9fa5
Ajay Panicker [Thu, 22 Sep 2016 01:35:54 +0000 (01:35 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev am:
447ac4b31d am:
4431d6cb5b
am:
852e5a43b9 -s ours
Change-Id: I2327ac15699e1734d4cf3ae4e1f7e8a5aedc0b5b
Ajay Panicker [Thu, 22 Sep 2016 01:34:51 +0000 (01:34 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
85bc33a8f4 am:
46442d1be1
am:
8be4dc7e16 -s ours
Change-Id: Ic7a46031556a3ae24d8f56808c0b9c631cf931a4
Elliot Waite [Wed, 21 Sep 2016 22:47:30 +0000 (15:47 -0700)]
Revert fixed at links.
This reverts commit
c4ae7827e26ab3d0ac340d896c28c166da860fdb.
Change-Id: I65729721ced7fc04d0b9691b63520007adddee29
Jaewan Kim [Wed, 21 Sep 2016 22:54:02 +0000 (22:54 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev
am:
22c9458a13
Change-Id: Ie3279270215a99f9b7f98dc6325f4cc7c431cc9b
Jaewan Kim [Wed, 21 Sep 2016 22:53:58 +0000 (22:53 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session
am:
c282c4f106
Change-Id: I8ec1e339f50ab7d017bcf91cddefc2b0f569c696
Jaewan Kim [Wed, 21 Sep 2016 22:53:38 +0000 (22:53 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session
am:
4e9af38ec4 -s ours
Change-Id: I416843909b0b49378d8b6dc4eb92032ae7a1418e
Jaewan Kim [Wed, 21 Sep 2016 22:53:29 +0000 (22:53 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev
am:
162c80bf0c
Change-Id: Icbabe6e78468cb4138b8cab77ff06432628739c0
Jaewan Kim [Wed, 21 Sep 2016 22:53:17 +0000 (22:53 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session
am:
6a1567c267
Change-Id: Ic2bdd07b94fd9d6bdaa701d3e719904a2f84cc4d
Adarsh Fernando [Wed, 21 Sep 2016 22:45:04 +0000 (15:45 -0700)]
Found a couple of more references to Android N.
Bug:
31647521
Change-Id: I9f8c40e43cb79656761f237a0f144ab8a9b4c5d5
Adarsh Fernando [Wed, 21 Sep 2016 22:26:48 +0000 (22:26 +0000)]
Merge "Docs: Cleanup of Preview language in Android 7.0 docs." into nyc-dev
Adarsh Fernando [Wed, 21 Sep 2016 20:56:37 +0000 (13:56 -0700)]
Docs: Cleanup of Preview language in Android 7.0 docs.
bug:
31647521
Change-Id: I882f7d7cb5bb1ddcc18ddbc29b17edbbbd84131a
Ajay Panicker [Wed, 21 Sep 2016 21:58:43 +0000 (21:58 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev am:
f78ff48d0d -s ours am:
7cd1668893
am:
a5e128ba97
Change-Id: Ibfdcd322fef7b589e6e6c14f25fb92b8b7ed43a1
Ajay Panicker [Wed, 21 Sep 2016 21:57:48 +0000 (21:57 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
27b3d578b9 -s ours am:
57fdbb97a6
am:
2cf025f976
Change-Id: Id5edc69b9594289566590d869ad0b4c0219fb242
Ajay Panicker [Wed, 21 Sep 2016 21:56:51 +0000 (21:56 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev am:
447ac4b31d
am:
4431d6cb5b
Change-Id: Ieeff1ea88cfef281c3ebf42312261a601c18e59d
Ajay Panicker [Wed, 21 Sep 2016 21:55:52 +0000 (21:55 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
85bc33a8f4
am:
46442d1be1
Change-Id: I50616eafb788247b103911bd5ac899899e3ba47c
TreeHugger Robot [Wed, 21 Sep 2016 21:47:00 +0000 (21:47 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev
TreeHugger Robot [Wed, 21 Sep 2016 21:46:51 +0000 (21:46 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev
TreeHugger Robot [Wed, 21 Sep 2016 21:46:41 +0000 (21:46 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into nyc-dev
Ajay Panicker [Wed, 21 Sep 2016 21:31:00 +0000 (21:31 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev am:
f78ff48d0d -s ours
am:
7cd1668893
Change-Id: Ibe7158ab142e8c566b05dc370c77393231f1f507
Ajay Panicker [Wed, 21 Sep 2016 21:30:13 +0000 (21:30 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
27b3d578b9 -s ours
am:
57fdbb97a6
Change-Id: I73e6ebd27ecabc7510ef9661eb1fcacdb2bafccf
Ajay Panicker [Wed, 21 Sep 2016 21:15:40 +0000 (21:15 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev
am:
f78ff48d0d -s ours
Change-Id: I82e447c8dbbabd40977805bc1d233de832296e6b
Ajay Panicker [Wed, 21 Sep 2016 21:15:37 +0000 (21:15 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed
am:
27b3d578b9 -s ours
Change-Id: Ia29f66f121813b3e03a16a665f7bdae2d75ed09b
Ajay Panicker [Wed, 21 Sep 2016 21:15:35 +0000 (21:15 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev
am:
447ac4b31d
Change-Id: I939008cb6b770c4273e258d91e2916a1823ec6fb
Ajay Panicker [Wed, 21 Sep 2016 21:15:32 +0000 (21:15 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed
am:
85bc33a8f4
Change-Id: I2194d4c01e8bff53a7d6fcdf25513b216a511155
Ajay Panicker [Wed, 21 Sep 2016 21:08:07 +0000 (21:08 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev
Ajay Panicker [Wed, 21 Sep 2016 21:08:04 +0000 (21:08 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev
Fan Zhang [Wed, 21 Sep 2016 15:29:56 +0000 (15:29 +0000)]
Merge "Fix NPE for WifiConfiguration in AccessPoint." into nyc-dev
Ajay Panicker [Wed, 21 Sep 2016 04:13:46 +0000 (04:13 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am:
60bf672485 am:
95b604ccb5 am:
fe616288dc -s ours am:
3a20f7ceac am:
be2651bb6b am:
a7176293fd
am:
e60aa74d44 -s ours
Change-Id: Id0fe233f9b700c7b41fe864699b54727108b6ecf
Ajay Panicker [Wed, 21 Sep 2016 04:02:02 +0000 (04:02 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am:
60bf672485 am:
95b604ccb5 am:
fe616288dc -s ours am:
3a20f7ceac am:
be2651bb6b
am:
a7176293fd
Change-Id: I480a3e8cfc363570ecb10d5cca2b0e1a95472f51
Ajay Panicker [Wed, 21 Sep 2016 03:44:15 +0000 (03:44 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am:
60bf672485 am:
95b604ccb5 am:
fe616288dc -s ours am:
3a20f7ceac
am:
be2651bb6b
Change-Id: I7ffc9b61fbfe670a68049b94a05415abec38e36e
Ajay Panicker [Wed, 21 Sep 2016 03:26:15 +0000 (03:26 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
bb9b38b957 am:
cc4fd13113 am:
b2094f7c37 -s ours am:
6b16f71975 am:
dddb99f020 am:
cdf3126615
am:
bd752f7d88 -s ours
Change-Id: I5657111479e2ac6df3f856c7a624421e37ec731d
Ajay Panicker [Wed, 21 Sep 2016 03:23:38 +0000 (03:23 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am:
60bf672485 am:
95b604ccb5 am:
fe616288dc -s ours
am:
3a20f7ceac
Change-Id: I10c29e499b19e247dedc4e65b3d1d4bd42a7eb03
Ajay Panicker [Wed, 21 Sep 2016 03:17:36 +0000 (03:17 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am:
19b09dd0d3 -s ours am:
5977c8b5bc am:
cdff42091b am:
9a66565324 -s ours am:
dcb78c9cf1 am:
3ed9e7693d am:
853e39d3d9
am:
232824e01c -s ours
Change-Id: Ic4636b08ecc94720c7b013769436668167b6fca8
Ajay Panicker [Wed, 21 Sep 2016 03:15:14 +0000 (03:15 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
0ea21bc70e -s ours am:
050b9170db am:
b367200be4 am:
ef74f3b079 -s ours am:
0f464f9d77 am:
1682f67177 am:
13ac17ab3a
am:
ec220f645f -s ours
Change-Id: If90aff1167803a965e938f9e174ec1df09401b85
Ajay Panicker [Wed, 21 Sep 2016 03:13:20 +0000 (03:13 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am:
204da8aa9e am:
a278a1e660 am:
3d995d6f5f -s ours am:
4f77ca16e4 -s ours am:
959b1aa5b9 am:
7caccc107f am:
1dcec33349 -s ours am:
2ef2d90eaa am:
b2e8361c50 am:
c147db7a79
am:
3e238e3396 -s ours
Change-Id: I52e1cfccc31b8169eaeb4e4aacc67b97b0e39cec
Ajay Panicker [Wed, 21 Sep 2016 03:12:09 +0000 (03:12 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
bb9b38b957 am:
cc4fd13113 am:
b2094f7c37 -s ours am:
6b16f71975 am:
dddb99f020
am:
cdf3126615
Change-Id: I37fdf0eb48bd07dc07b8716040d2f286304bce70
Ajay Panicker [Wed, 21 Sep 2016 03:12:02 +0000 (03:12 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
edae39d59a am:
271e34dbd5 am:
3758253ae8 -s ours am:
cb970f408e -s ours am:
fafa73a8ac am:
0639d05e55 am:
a701b1b6f6 -s ours am:
afafdff50e am:
d46605ab09 am:
fc7822f58a
am:
93a622150f -s ours
Change-Id: If89cb759ef536ee618a3ab6121fde4e3dbc6dac3
Ajay Panicker [Wed, 21 Sep 2016 03:10:15 +0000 (03:10 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am:
60bf672485 am:
95b604ccb5
am:
fe616288dc -s ours
Change-Id: I858b0c0f7d1b9e723857169bd7f29a55d82e0136
Ajay Panicker [Wed, 21 Sep 2016 02:56:53 +0000 (02:56 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
bb9b38b957 am:
cc4fd13113 am:
b2094f7c37 -s ours am:
6b16f71975
am:
dddb99f020
Change-Id: Ie45bd66830e6e3e68be7e3f2692911ea4fa82fa9
Ajay Panicker [Wed, 21 Sep 2016 02:55:36 +0000 (02:55 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am:
60bf672485
am:
95b604ccb5
Change-Id: I78d80c17e2b7a0b6d0d611f738a3b880dd74dab0
Ajay Panicker [Wed, 21 Sep 2016 02:54:19 +0000 (02:54 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am:
19b09dd0d3 -s ours am:
5977c8b5bc am:
cdff42091b am:
9a66565324 -s ours am:
dcb78c9cf1 am:
3ed9e7693d
am:
853e39d3d9
Change-Id: I1f1f4f44161525bb4ee7fbbcabdd5a6e346d3b8a
Ajay Panicker [Wed, 21 Sep 2016 02:40:31 +0000 (02:40 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
0ea21bc70e -s ours am:
050b9170db am:
b367200be4 am:
ef74f3b079 -s ours am:
0f464f9d77 am:
1682f67177
am:
13ac17ab3a
Change-Id: I495579b3cca396dd5fb6a628bedb5e5be4916b26
Ajay Panicker [Wed, 21 Sep 2016 02:38:56 +0000 (02:38 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am:
204da8aa9e am:
a278a1e660 am:
3d995d6f5f -s ours am:
4f77ca16e4 -s ours am:
959b1aa5b9 am:
7caccc107f am:
1dcec33349 -s ours am:
2ef2d90eaa am:
b2e8361c50
am:
c147db7a79
Change-Id: I52a9da62a72e21a052561b8aa1760bedb8a4b8c6
Ajay Panicker [Wed, 21 Sep 2016 02:37:38 +0000 (02:37 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
edae39d59a am:
271e34dbd5 am:
3758253ae8 -s ours am:
cb970f408e -s ours am:
fafa73a8ac am:
0639d05e55 am:
a701b1b6f6 -s ours am:
afafdff50e am:
d46605ab09
am:
fc7822f58a
Change-Id: I7b744f3d3c5e816a1722b20bad66b924911b8a36
Ajay Panicker [Wed, 21 Sep 2016 02:37:35 +0000 (02:37 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
bb9b38b957 am:
cc4fd13113 am:
b2094f7c37 -s ours
am:
6b16f71975
Change-Id: I2f7ec847c4d781a80e950c3ede965456163c90f9
Ajay Panicker [Wed, 21 Sep 2016 02:35:59 +0000 (02:35 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am:
19b09dd0d3 -s ours am:
5977c8b5bc am:
cdff42091b am:
9a66565324 -s ours am:
dcb78c9cf1
am:
3ed9e7693d
Change-Id: Ie6c2f8cf182d0787ffc401800134f30fde903e3b
Ajay Panicker [Wed, 21 Sep 2016 02:24:44 +0000 (02:24 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
0ea21bc70e -s ours am:
050b9170db am:
b367200be4 am:
ef74f3b079 -s ours am:
0f464f9d77
am:
1682f67177
Change-Id: I75da25a30cc7be28b3a2d332fa5ca7fc18322dfc
Ajay Panicker [Wed, 21 Sep 2016 02:24:08 +0000 (02:24 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am:
19b09dd0d3 -s ours am:
5977c8b5bc am:
cdff42091b am:
9a66565324 -s ours
am:
dcb78c9cf1
Change-Id: I196204c683a0eacbe08103b383dcd9cb1435a43d
Ajay Panicker [Wed, 21 Sep 2016 02:23:37 +0000 (02:23 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am:
204da8aa9e am:
a278a1e660 am:
3d995d6f5f -s ours am:
4f77ca16e4 -s ours am:
959b1aa5b9 am:
7caccc107f am:
1dcec33349 -s ours am:
2ef2d90eaa
am:
b2e8361c50
Change-Id: I679522909e4498442cb2e227ac0b7c45fbc47ebf
Ajay Panicker [Wed, 21 Sep 2016 02:22:08 +0000 (02:22 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev
am:
60bf672485
Change-Id: Iba3b6ff14fdab510e1e0c8fae7298be290e93bf1
Ajay Panicker [Wed, 21 Sep 2016 02:21:15 +0000 (02:21 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
edae39d59a am:
271e34dbd5 am:
3758253ae8 -s ours am:
cb970f408e -s ours am:
fafa73a8ac am:
0639d05e55 am:
a701b1b6f6 -s ours am:
afafdff50e
am:
d46605ab09
Change-Id: Icc3905c1133d4ed3b3ea40f95bde021933adcd02
Elliot Waite [Wed, 21 Sep 2016 02:15:09 +0000 (02:15 +0000)]
Merge "Fix some at links." into nyc-dev
Ajay Panicker [Wed, 21 Sep 2016 02:09:09 +0000 (02:09 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
bb9b38b957 am:
cc4fd13113
am:
b2094f7c37 -s ours
Change-Id: I202fe25cf207a5063f897d13617fc0a03fe2ca83
Ajay Panicker [Wed, 21 Sep 2016 02:03:46 +0000 (02:03 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
0ea21bc70e -s ours am:
050b9170db am:
b367200be4 am:
ef74f3b079 -s ours
am:
0f464f9d77
Change-Id: I0c7d7db1dcc585477d5f7841137b5603270eabe6
Ajay Panicker [Wed, 21 Sep 2016 02:02:47 +0000 (02:02 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am:
204da8aa9e am:
a278a1e660 am:
3d995d6f5f -s ours am:
4f77ca16e4 -s ours am:
959b1aa5b9 am:
7caccc107f am:
1dcec33349 -s ours
am:
2ef2d90eaa
Change-Id: Iff03e10920f3d42246b7b7e2c172ac30b3beaccb
Ajay Panicker [Wed, 21 Sep 2016 02:01:38 +0000 (02:01 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
edae39d59a am:
271e34dbd5 am:
3758253ae8 -s ours am:
cb970f408e -s ours am:
fafa73a8ac am:
0639d05e55 am:
a701b1b6f6 -s ours
am:
afafdff50e
Change-Id: I33b393b32af485c4bb96d723a44e24d1acefaadc
OSDN Git Service
