summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorBenjamin Franz <bfranz@google.com>2014-12-09 00:17:44 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-09 00:17:44 +0000
commit9c0e993d4e77f990a99a846a165975598c7ddeae (patch)
tree7a6da9018808e297b6764375a43c8b9abb0422a9 /Android.mk
parent18b4204ee5373a169120918dcc5e2acb4efdc5f6 (diff)
parentf4a76651b0fec69242822e57441b1a937fb6daf3 (diff)
downloadframeworks_base-9c0e993d4e77f990a99a846a165975598c7ddeae.zip
frameworks_base-9c0e993d4e77f990a99a846a165975598c7ddeae.tar.gz
frameworks_base-9c0e993d4e77f990a99a846a165975598c7ddeae.tar.bz2
am f4a76651: am 5f1ea2e6: am fb967585: Merge "Change the routing path of bluetooth headset connections." into lmp-mr1-dev
* commit 'f4a76651b0fec69242822e57441b1a937fb6daf3': Change the routing path of bluetooth headset connections.
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 78ade3f..211dd64 100644
--- a/Android.mk
+++ b/Android.mk
@@ -100,6 +100,7 @@ LOCAL_SRC_FILES += \
core/java/android/bluetooth/IBluetoothA2dpSink.aidl \
core/java/android/bluetooth/IBluetoothAvrcpController.aidl \
core/java/android/bluetooth/IBluetoothCallback.aidl \
+ core/java/android/bluetooth/IBluetoothProfileServiceConnection.aidl \
core/java/android/bluetooth/IBluetoothHeadset.aidl \
core/java/android/bluetooth/IBluetoothHeadsetPhone.aidl \
core/java/android/bluetooth/IBluetoothHealth.aidl \