summaryrefslogtreecommitdiff
path: root/framework/java/android/bluetooth/BluetoothManager.java
diff options
context:
space:
mode:
authorAjay Panicker <apanicke@google.com>2016-09-22 20:35:06 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-22 20:35:06 +0000
commit9fbc613c60f21f87f17b48801b1f89c3b38a1fd9 (patch)
tree400f8b3120f55e571b0741b9176a714ebc89a0dc /framework/java/android/bluetooth/BluetoothManager.java
parent78c29568314833705551976c72fef01b18c6db9b (diff)
parentb630ddc40431540c23a02f43d41c7a548104d6be (diff)
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am: 0641d0f6bf am: d889c8e759 am: 42161e253f -s ours am: 9d449d4849 -s ours am: af877beb44 am: e8d2999598 am: 276ff95f11 -s ours am: 72afb582db am: afeaced48f am: b65fcfd96c am: 0ec10c8fdc -s ours
am: b630ddc404 Change-Id: I50571a7570a8f98d2e1b473694534ac478b060b7
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothManager.java')
0 files changed, 0 insertions, 0 deletions