Change-Id: I32289676d95a307ea3aa5e78f6c126ca979c0fec Signed-off-by: Todd Poynor <toddpoynor@google.com> (cherry picked from commit 7013f4976374ea75cb35446393be7bdc37bf607f) Conflicts: kernel/power/wakelock.c
Change-Id: I32289676d95a307ea3aa5e78f6c126ca979c0fec Signed-off-by: Todd Poynor <toddpoynor@google.com> (cherry picked from commit 7013f4976374ea75cb35446393be7bdc37bf607f) Conflicts: kernel/power/wakelock.c