Merge "Bluetooth Health APIs"

diff --cc core/java/android/bluetooth/IBluetooth.aidl
Simple merge

diff --cc core/java/android/server/BluetoothService.java
index 9839f76,2689788..b23e3ce
mode 100644,100755..100755
--- 1/core/java/android/server/BluetoothService.java
--- 2/core/java/android/server/BluetoothService.java
+++ b/core/java/android/server/BluetoothService.java
@@@ -58,11 -57,10 +57,13 @@@ import android.provider.Settings
  import android.util.Log;
  import android.util.Pair;
  
+ import com.android.internal.app.IBatteryStats;
+ 
  import java.io.BufferedInputStream;
 +import java.io.BufferedReader;
  import java.io.BufferedWriter;
 +import java.io.DataInputStream;
 +import java.io.File;
  import java.io.FileDescriptor;
  import java.io.FileInputStream;
  import java.io.FileNotFoundException;

diff --cc core/jni/android_server_BluetoothService.cpp
Simple merge