summaryrefslogtreecommitdiffstats
path: root/policy
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-03-28 14:32:59 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-28 14:32:59 -0700
commitd1e0f941d5a2308530590e21940c857cad41e2e2 (patch)
tree6f0db1ce226cb577f6cd7516be0f612d86cf865f /policy
parent565dd2c46907a530672eba3fb4f07b2a8d06f438 (diff)
parent0f3a3777026c20011f1b419daf12980715e594ff (diff)
downloadframeworks_base-d1e0f941d5a2308530590e21940c857cad41e2e2.zip
frameworks_base-d1e0f941d5a2308530590e21940c857cad41e2e2.tar.gz
frameworks_base-d1e0f941d5a2308530590e21940c857cad41e2e2.tar.bz2
am 0f3a3777: am 94eaab4a: am 3ae30483: am a19647d3: Merge "Correct executable bit for source files [Take 2]"
* commit '0f3a3777026c20011f1b419daf12980715e594ff': Correct executable bit for source files [Take 2]
Diffstat (limited to 'policy')
-rw-r--r--[-rwxr-xr-x]policy/src/com/android/internal/policy/impl/GlobalActions.java0
1 files changed, 0 insertions, 0 deletions
diff --git a/policy/src/com/android/internal/policy/impl/GlobalActions.java b/policy/src/com/android/internal/policy/impl/GlobalActions.java
index a2ac8fe..a2ac8fe 100755..100644
--- a/policy/src/com/android/internal/policy/impl/GlobalActions.java
+++ b/policy/src/com/android/internal/policy/impl/GlobalActions.java