commit 9e0c0a784e4c94d7b829b5837bdad10076f06e98
author Chih-Hung Hsieh <chh@google.com> Thu Sep 04 20:28:54 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 04 20:28:54 2014 +0000
tree 9fa934a4305f1ff348d0efca931be1614150535a
parent df697c4db5599ec7893bc740bf661eeab888be6b
parent f583a75c0940218c3df0170b514bcba1c992aecf

am f583a75c: Merge "Comment out unused parameter."

* commit 'f583a75c0940218c3df0170b514bcba1c992aecf':
  Comment out unused parameter.

keystore/keystore.cpp

diff --git a/keystore/keystore.cpp b/keystore/keystore.cpp
index 9e460d7..6cd2f6a 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;
     }