Commits
Craig Mautner authored and The Android Automerger committed 093405813c3
Check proximity detector before powering off. Do not automatically power off if the proximity detector wakelock is active. Fixes bug 7047455. Change-Id: I44e30bf388292e5c476dfb5d0de9226d21853e4d