Bug 826366 - Remove on call cpu wakelock if the screen is not turned off by proximity event
Merge pull request #7290 from timdream/scm/remove-cpulock-when-manual-off

Bug 826366 - Remove on call cpu wakelock if the screen is not turned off by proximity event, r=etienne, a=blocking-basecamp