summaryrefslogtreecommitdiffstats
path: root/services/java/com
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2012-11-07 11:52:12 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-07 11:52:12 -0800
commit58ed5d748c0b9b64845975ef5844ad313de7c3f6 (patch)
tree507af3879bc894eb854712a1fe6c0953805a895c /services/java/com
parent9197d170b770f2b87abd0cd0e13dcf71e5a181c2 (diff)
parent768d9e1a72ceee7d4a5f608776b87b62d6ce4a04 (diff)
downloadframeworks_base-58ed5d748c0b9b64845975ef5844ad313de7c3f6.zip
frameworks_base-58ed5d748c0b9b64845975ef5844ad313de7c3f6.tar.gz
frameworks_base-58ed5d748c0b9b64845975ef5844ad313de7c3f6.tar.bz2
am 768d9e1a: Merge "Correct executable bit for source files"
* commit '768d9e1a72ceee7d4a5f608776b87b62d6ce4a04': Correct executable bit for source files
Diffstat (limited to 'services/java/com')
-rw-r--r--[-rwxr-xr-x]services/java/com/android/server/NotificationManagerService.java0
-rw-r--r--[-rwxr-xr-x]services/java/com/android/server/VibratorService.java0
-rw-r--r--[-rwxr-xr-x]services/java/com/android/server/am/ActivityStack.java0
-rw-r--r--[-rwxr-xr-x]services/java/com/android/server/am/package.html0
-rw-r--r--[-rwxr-xr-x]services/java/com/android/server/location/ComprehensiveCountryDetector.java0
-rw-r--r--[-rwxr-xr-x]services/java/com/android/server/location/GpsLocationProvider.java0
-rw-r--r--[-rwxr-xr-x]services/java/com/android/server/location/LocationBasedCountryDetector.java0
-rw-r--r--[-rwxr-xr-x]services/java/com/android/server/wm/WindowManagerService.java0
8 files changed, 0 insertions, 0 deletions
diff --git a/services/java/com/android/server/NotificationManagerService.java b/services/java/com/android/server/NotificationManagerService.java
index 0e171cd..0e171cd 100755..100644
--- a/services/java/com/android/server/NotificationManagerService.java
+++ b/services/java/com/android/server/NotificationManagerService.java
diff --git a/services/java/com/android/server/VibratorService.java b/services/java/com/android/server/VibratorService.java
index df91dec..df91dec 100755..100644
--- a/services/java/com/android/server/VibratorService.java
+++ b/services/java/com/android/server/VibratorService.java
diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java
index 4546dc3..4546dc3 100755..100644
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
diff --git a/services/java/com/android/server/am/package.html b/services/java/com/android/server/am/package.html
index c9f96a6..c9f96a6 100755..100644
--- a/services/java/com/android/server/am/package.html
+++ b/services/java/com/android/server/am/package.html
diff --git a/services/java/com/android/server/location/ComprehensiveCountryDetector.java b/services/java/com/android/server/location/ComprehensiveCountryDetector.java
index 354858b..354858b 100755..100644
--- a/services/java/com/android/server/location/ComprehensiveCountryDetector.java
+++ b/services/java/com/android/server/location/ComprehensiveCountryDetector.java
diff --git a/services/java/com/android/server/location/GpsLocationProvider.java b/services/java/com/android/server/location/GpsLocationProvider.java
index c272da4..c272da4 100755..100644
--- a/services/java/com/android/server/location/GpsLocationProvider.java
+++ b/services/java/com/android/server/location/GpsLocationProvider.java
diff --git a/services/java/com/android/server/location/LocationBasedCountryDetector.java b/services/java/com/android/server/location/LocationBasedCountryDetector.java
index 03db621..03db621 100755..100644
--- a/services/java/com/android/server/location/LocationBasedCountryDetector.java
+++ b/services/java/com/android/server/location/LocationBasedCountryDetector.java
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java
index 0659409..0659409 100755..100644
--- a/services/java/com/android/server/wm/WindowManagerService.java
+++ b/services/java/com/android/server/wm/WindowManagerService.java