summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-03-28 14:29:21 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-28 14:29:21 -0700
commit94eaab4a5ddd6db4bcbc8a1e65a4d8e60d1d1274 (patch)
tree76f55bd1ca1fcc4f307918e13faff9c471625017 /core/java
parent5c3bd37ab7b18bd5c3ea4bfcb86cc0a30c10d534 (diff)
parent3ae30483777708ff3a4f59a4fa75c6a76213cc30 (diff)
am 3ae30483: am a19647d3: Merge "Correct executable bit for source files [Take 2]"
* commit '3ae30483777708ff3a4f59a4fa75c6a76213cc30': Correct executable bit for source files [Take 2]
Diffstat (limited to 'core/java')
-rw-r--r--[-rwxr-xr-x]core/java/android/bluetooth/BluetoothA2dp.java0
-rw-r--r--[-rwxr-xr-x]core/java/android/bluetooth/BluetoothDevice.java0
-rw-r--r--[-rwxr-xr-x]core/java/android/bluetooth/BluetoothHeadset.java0
-rw-r--r--[-rwxr-xr-x]core/java/android/bluetooth/BluetoothInputDevice.java0
-rw-r--r--[-rwxr-xr-x]core/java/android/bluetooth/BluetoothPbap.java0
-rw-r--r--[-rwxr-xr-x]core/java/android/bluetooth/IBluetoothInputDevice.aidl0
-rw-r--r--[-rwxr-xr-x]core/java/android/bluetooth/IBluetoothManager.aidl0
7 files changed, 0 insertions, 0 deletions
diff --git a/core/java/android/bluetooth/BluetoothA2dp.java b/core/java/android/bluetooth/BluetoothA2dp.java
index 6fdf3b47b85f..6fdf3b47b85f 100755..100644
--- a/core/java/android/bluetooth/BluetoothA2dp.java
+++ b/core/java/android/bluetooth/BluetoothA2dp.java
diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java
index 4cc22b4ae909..4cc22b4ae909 100755..100644
--- a/core/java/android/bluetooth/BluetoothDevice.java
+++ b/core/java/android/bluetooth/BluetoothDevice.java
diff --git a/core/java/android/bluetooth/BluetoothHeadset.java b/core/java/android/bluetooth/BluetoothHeadset.java
index 793d79858c6c..793d79858c6c 100755..100644
--- a/core/java/android/bluetooth/BluetoothHeadset.java
+++ b/core/java/android/bluetooth/BluetoothHeadset.java
diff --git a/core/java/android/bluetooth/BluetoothInputDevice.java b/core/java/android/bluetooth/BluetoothInputDevice.java
index db7e424d40ee..db7e424d40ee 100755..100644
--- a/core/java/android/bluetooth/BluetoothInputDevice.java
+++ b/core/java/android/bluetooth/BluetoothInputDevice.java
diff --git a/core/java/android/bluetooth/BluetoothPbap.java b/core/java/android/bluetooth/BluetoothPbap.java
index b5280e533778..b5280e533778 100755..100644
--- a/core/java/android/bluetooth/BluetoothPbap.java
+++ b/core/java/android/bluetooth/BluetoothPbap.java
diff --git a/core/java/android/bluetooth/IBluetoothInputDevice.aidl b/core/java/android/bluetooth/IBluetoothInputDevice.aidl
index 1ebb9ca6eb12..1ebb9ca6eb12 100755..100644
--- a/core/java/android/bluetooth/IBluetoothInputDevice.aidl
+++ b/core/java/android/bluetooth/IBluetoothInputDevice.aidl
diff --git a/core/java/android/bluetooth/IBluetoothManager.aidl b/core/java/android/bluetooth/IBluetoothManager.aidl
index ed8777c51526..ed8777c51526 100755..100644
--- a/core/java/android/bluetooth/IBluetoothManager.aidl
+++ b/core/java/android/bluetooth/IBluetoothManager.aidl