summaryrefslogtreecommitdiffstats
path: root/tools
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 /tools
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 'tools')
-rw-r--r--[-rwxr-xr-x]tools/aidl/AST.cpp0
-rw-r--r--[-rwxr-xr-x]tools/aidl/AST.h0
-rw-r--r--[-rwxr-xr-x]tools/aidl/Type.cpp0
-rw-r--r--[-rwxr-xr-x]tools/aidl/Type.h0
-rw-r--r--[-rwxr-xr-x]tools/layoutlib/bridge/src/android/util/Log_Delegate.java0
-rw-r--r--[-rwxr-xr-x]tools/layoutlib/create/src/com/android/tools/layoutlib/annotations/Nullable.java0
-rw-r--r--[-rwxr-xr-x]tools/layoutlib/create/src/com/android/tools/layoutlib/annotations/VisibleForTesting.java0
-rw-r--r--[-rwxr-xr-x]tools/layoutlib/create/src/com/android/tools/layoutlib/create/DependencyFinder.java0
8 files changed, 0 insertions, 0 deletions
diff --git a/tools/aidl/AST.cpp b/tools/aidl/AST.cpp
index bfa6765..bfa6765 100755..100644
--- a/tools/aidl/AST.cpp
+++ b/tools/aidl/AST.cpp
diff --git a/tools/aidl/AST.h b/tools/aidl/AST.h
index ead5e7a..ead5e7a 100755..100644
--- a/tools/aidl/AST.h
+++ b/tools/aidl/AST.h
diff --git a/tools/aidl/Type.cpp b/tools/aidl/Type.cpp
index d572af6..d572af6 100755..100644
--- a/tools/aidl/Type.cpp
+++ b/tools/aidl/Type.cpp
diff --git a/tools/aidl/Type.h b/tools/aidl/Type.h
index ae12720..ae12720 100755..100644
--- a/tools/aidl/Type.h
+++ b/tools/aidl/Type.h
diff --git a/tools/layoutlib/bridge/src/android/util/Log_Delegate.java b/tools/layoutlib/bridge/src/android/util/Log_Delegate.java
index 7f432ab..7f432ab 100755..100644
--- a/tools/layoutlib/bridge/src/android/util/Log_Delegate.java
+++ b/tools/layoutlib/bridge/src/android/util/Log_Delegate.java
diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/annotations/Nullable.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/annotations/Nullable.java
index 0689c92..0689c92 100755..100644
--- a/tools/layoutlib/create/src/com/android/tools/layoutlib/annotations/Nullable.java
+++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/annotations/Nullable.java
diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/annotations/VisibleForTesting.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/annotations/VisibleForTesting.java
index e4e016b..e4e016b 100755..100644
--- a/tools/layoutlib/create/src/com/android/tools/layoutlib/annotations/VisibleForTesting.java
+++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/annotations/VisibleForTesting.java
diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/DependencyFinder.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/DependencyFinder.java
index c988c70..c988c70 100755..100644
--- a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/DependencyFinder.java
+++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/DependencyFinder.java