commit dbbc4082fa9aa77e0ddd6b33fa2338d066d8e0bd
author Chih-Hung Hsieh <chh@google.com> Fri Mar 20 20:56:08 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 20 20:56:08 2015 +0000
tree 6e53cd26589e4c4061707a0ba464e50d2254de6b
parent 59ede65637d6180e73aa8590e5d6454de8936c77
parent 9e0c0a784e4c94d7b829b5837bdad10076f06e98

am 9e0c0a78: am f583a75c: Merge "Comment out unused parameter."

* commit '9e0c0a784e4c94d7b829b5837bdad10076f06e98':
  Comment out unused parameter.

keystore/keystore.cpp

diff --git a/keystore/keystore.cpp b/keystore/keystore.cpp
index 63f7ee2..e56edfd 100644
--- a/keystore/keystore.cpp
+++ b/keystore/keystore.cpp
@@ -231,7 +231,7 @@
     return uid / AID_USER;
 }
 
-static bool keystore_selinux_check_access(uid_t uid, perm_t perm, pid_t spid) {
+static bool keystore_selinux_check_access(uid_t /*uid*/, perm_t perm, pid_t spid) {
     if (!ks_is_selinux_enabled) {
         return true;
     }