diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-25 11:45:46 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-11-25 11:45:46 -0800 |
| commit | 38c3386a6cd44789f540fb9700c284345e7269e3 (patch) | |
| tree | 64472dc40352949e03460907c7c882f885dac5e1 /healthd/healthd.cpp | |
| parent | 8e76610cfc729ad1e2cd4f0cd29007ee32c09172 (diff) | |
| parent | 03be4928422bd601bce3267fcf69b160f175db6d (diff) | |
| download | core-38c3386a6cd44789f540fb9700c284345e7269e3.tar.gz core-38c3386a6cd44789f540fb9700c284345e7269e3.tar.bz2 core-38c3386a6cd44789f540fb9700c284345e7269e3.zip | |
resolved conflicts for merge of 03be4928 to lmp-mr1-dev-plus-aosp
Change-Id: I7c72ed2c54ceae19c9dfe8b2e1707f869faad110
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 f4171bd47..1fee855c0 100644 --- a/healthd/healthd.cpp +++ b/healthd/healthd.cpp @@ -65,7 +65,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; |