tree 97e8a1b5c8af162ebda2b67a1b94348f969ee2ae
parent 94980e0f76295de53bd168608d11dba3c39cca9d
parent e6ae5c39848d2a3a6f3fb750811550969799e410
author Kenny Root <kroot@google.com> 1287004939 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287004939 -0700

am e6ae5c39: Merge "Add shutdown assurance" into gingerbread

Merge commit 'e6ae5c39848d2a3a6f3fb750811550969799e410' into gingerbread-plus-aosp

* commit 'e6ae5c39848d2a3a6f3fb750811550969799e410':
  Add shutdown assurance