commit 94eaab4a5ddd6db4bcbc8a1e65a4d8e60d1d1274
author Elliott Hughes <enh@google.com> Thu Mar 28 14:29:21 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 28 14:29:21 2013 -0700
tree 76f55bd1ca1fcc4f307918e13faff9c471625017
parent 5c3bd37ab7b18bd5c3ea4bfcb86cc0a30c10d534
parent 3ae30483777708ff3a4f59a4fa75c6a76213cc30

am 3ae30483: am a19647d3: Merge "Correct executable bit for source files [Take 2]"

* commit '3ae30483777708ff3a4f59a4fa75c6a76213cc30':
  Correct executable bit for source files [Take 2]

core/java/android/bluetooth/BluetoothA2dp.java

diff --git a/core/java/android/bluetooth/BluetoothA2dp.java b/core/java/android/bluetooth/BluetoothA2dp.java
old mode 100755
new mode 100644

core/java/android/bluetooth/BluetoothDevice.java

diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java
old mode 100755
new mode 100644

core/java/android/bluetooth/BluetoothHeadset.java

diff --git a/core/java/android/bluetooth/BluetoothHeadset.java b/core/java/android/bluetooth/BluetoothHeadset.java
old mode 100755
new mode 100644

core/java/android/bluetooth/BluetoothInputDevice.java

diff --git a/core/java/android/bluetooth/BluetoothInputDevice.java b/core/java/android/bluetooth/BluetoothInputDevice.java
old mode 100755
new mode 100644

core/java/android/bluetooth/BluetoothPbap.java

diff --git a/core/java/android/bluetooth/BluetoothPbap.java b/core/java/android/bluetooth/BluetoothPbap.java
old mode 100755
new mode 100644

core/java/android/bluetooth/IBluetoothInputDevice.aidl

diff --git a/core/java/android/bluetooth/IBluetoothInputDevice.aidl b/core/java/android/bluetooth/IBluetoothInputDevice.aidl
old mode 100755
new mode 100644

core/java/android/bluetooth/IBluetoothManager.aidl

diff --git a/core/java/android/bluetooth/IBluetoothManager.aidl b/core/java/android/bluetooth/IBluetoothManager.aidl
old mode 100755
new mode 100644

core/res/res/values-mcc286/config.xml

diff --git a/core/res/res/values-mcc286/config.xml b/core/res/res/values-mcc286/config.xml
old mode 100755
new mode 100644

core/res/res/xml/kg_password_kbd_numeric.xml

diff --git a/core/res/res/xml/kg_password_kbd_numeric.xml b/core/res/res/xml/kg_password_kbd_numeric.xml
old mode 100755
new mode 100644

docs/html/google/play/billing/v2/billing_integrate.jd

diff --git a/docs/html/google/play/billing/v2/billing_integrate.jd b/docs/html/google/play/billing/v2/billing_integrate.jd
old mode 100755
new mode 100644

docs/html/images/ui/notifications/custom_message.png

diff --git a/docs/html/images/ui/notifications/custom_message.png b/docs/html/images/ui/notifications/custom_message.png
old mode 100755
new mode 100644
Binary files differ

docs/html/images/ui/notifications/notifications_window.png

diff --git a/docs/html/images/ui/notifications/notifications_window.png b/docs/html/images/ui/notifications/notifications_window.png
old mode 100755
new mode 100644
Binary files differ

docs/html/images/ui/notifications/status_bar.png

diff --git a/docs/html/images/ui/notifications/status_bar.png b/docs/html/images/ui/notifications/status_bar.png
old mode 100755
new mode 100644
Binary files differ

docs/html/training/animation/anim_card_flip.mp4

diff --git a/docs/html/training/animation/anim_card_flip.mp4 b/docs/html/training/animation/anim_card_flip.mp4
old mode 100755
new mode 100644
Binary files differ

docs/html/training/animation/anim_card_flip.ogv

diff --git a/docs/html/training/animation/anim_card_flip.ogv b/docs/html/training/animation/anim_card_flip.ogv
old mode 100755
new mode 100644
Binary files differ

docs/html/training/animation/anim_card_flip.webm

diff --git a/docs/html/training/animation/anim_card_flip.webm b/docs/html/training/animation/anim_card_flip.webm
old mode 100755
new mode 100644
Binary files differ

docs/html/training/animation/anim_screenslide.mp4

diff --git a/docs/html/training/animation/anim_screenslide.mp4 b/docs/html/training/animation/anim_screenslide.mp4
old mode 100755
new mode 100644
Binary files differ

docs/html/training/animation/anim_screenslide.ogv

diff --git a/docs/html/training/animation/anim_screenslide.ogv b/docs/html/training/animation/anim_screenslide.ogv
old mode 100755
new mode 100644
Binary files differ

docs/html/training/animation/anim_screenslide.webm

diff --git a/docs/html/training/animation/anim_screenslide.webm b/docs/html/training/animation/anim_screenslide.webm
old mode 100755
new mode 100644
Binary files differ

libs/hwui/Dither.cpp

diff --git a/libs/hwui/Dither.cpp b/libs/hwui/Dither.cpp
old mode 100755
new mode 100644

libs/hwui/Dither.h

diff --git a/libs/hwui/Dither.h b/libs/hwui/Dither.h
old mode 100755
new mode 100644

packages/SystemUI/src/com/android/systemui/statusbar/GestureRecorder.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/GestureRecorder.java b/packages/SystemUI/src/com/android/systemui/statusbar/GestureRecorder.java
old mode 100755
new mode 100644

policy/src/com/android/internal/policy/impl/GlobalActions.java

diff --git a/policy/src/com/android/internal/policy/impl/GlobalActions.java b/policy/src/com/android/internal/policy/impl/GlobalActions.java
old mode 100755
new mode 100644

services/java/com/android/server/BluetoothManagerService.java

diff --git a/services/java/com/android/server/BluetoothManagerService.java b/services/java/com/android/server/BluetoothManagerService.java
old mode 100755
new mode 100644