diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-25 20:03:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-25 20:03:41 +0000 |
| commit | 906ee0d75770028167cc504af412846f593246af (patch) | |
| tree | 9c79734b2131ca300486df306ecf55c0d39b9849 /healthd/healthd.cpp | |
| parent | 0f41d611290128273eb18d6fea4be7f0922c8a4b (diff) | |
| parent | 38c3386a6cd44789f540fb9700c284345e7269e3 (diff) | |
| download | core-906ee0d75770028167cc504af412846f593246af.tar.gz core-906ee0d75770028167cc504af412846f593246af.tar.bz2 core-906ee0d75770028167cc504af412846f593246af.zip | |
am 38c3386a: resolved conflicts for merge of 03be4928 to lmp-mr1-dev-plus-aosp
* commit '38c3386a6cd44789f540fb9700c284345e7269e3':
Healthd: Remove unused variables
Diffstat (limited to 'healthd/healthd.cpp')
| -rw-r--r-- | healthd/healthd.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/healthd/healthd.cpp b/healthd/healthd.cpp index cc322d378..b0002cc95 100644 --- a/healthd/healthd.cpp +++ b/healthd/healthd.cpp @@ -66,7 +66,6 @@ static int epollfd; #define MAX_EPOLL_EVENTS 40 static int uevent_fd; static int wakealarm_fd; -static int binder_fd; // -1 for no epoll timeout static int awake_poll_interval = -1; |