am 2aaa1ce1: Merge "Hold partial wakelock during shutdown to avoid entering sleep"

Merge commit '2aaa1ce1768d3425c07e55d43aaa400282424f8c' into gingerbread-plus-aosp

* commit '2aaa1ce1768d3425c07e55d43aaa400282424f8c':
  Hold partial wakelock during shutdown to avoid entering sleep

diff --cc core/java/com/android/internal/app/ShutdownThread.java
Simple merge