diff options
author | Ajay Panicker <apanicke@google.com> | 2016-09-22 10:56:50 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-09-22 10:56:50 +0000 |
commit | bcdcd18f064bf652be344ef4fa2eb2f737d8f8f0 (patch) | |
tree | 8aca67b2ec07697284e265fde84b89f954f5e59a /framework/java/android/bluetooth/BluetoothManager.java | |
parent | c9f07a5cec09125ee22012cdf1556a8683eff7ea (diff) | |
parent | 771f58c59954815f9049ae7e64727d1eec403060 (diff) |
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev am: 9e0f36e40e -s ours am: be7a220d3e am: 7a835be4dc am: 0ba75416f7 -s ours am: 2143e01136 am: f65661939b am: 771f58c599
am: c9830d56e5 -s ours
Change-Id: Iaae899eeea3c9c95ebcd7654e6fb5a89d7f1ed90
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothManager.java')
0 files changed, 0 insertions, 0 deletions