aboutsummaryrefslogtreecommitdiff
path: root/framework/java/android/bluetooth/BluetoothAdapter.java
diff options
context:
space:
mode:
authorJakub Pawlowski <jpawlowski@google.com>2017-04-28 00:36:03 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-04-28 00:36:03 +0000
commit8dda0e3911da7491122db469ac318cd30dc8567c (patch)
treec193159cc14adb4ddb293f8af01d1152b6192383 /framework/java/android/bluetooth/BluetoothAdapter.java
parent4c3ba400301f6a0ac814367ebcc72f5653ad646b (diff)
parentd8375f532869c1e7130d9acae4fa95ba20e3cdda (diff)
Merge changes from topic 'bt5-cherry-pickerry-3' into oc-dev
am: 9a4b756c9b Change-Id: I3b18c86a3981db316369a11d91a9334a38205151
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothAdapter.java')
0 files changed, 0 insertions, 0 deletions