summaryrefslogtreecommitdiffstats
path: root/keystore
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 /keystore
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 'keystore')
-rw-r--r--[-rwxr-xr-x]keystore/tests/src/android/security/KeyStoreTest.java0
1 files changed, 0 insertions, 0 deletions
diff --git a/keystore/tests/src/android/security/KeyStoreTest.java b/keystore/tests/src/android/security/KeyStoreTest.java
index 07a2d7b..07a2d7b 100755..100644
--- a/keystore/tests/src/android/security/KeyStoreTest.java
+++ b/keystore/tests/src/android/security/KeyStoreTest.java