tree 4df5728bd54cf65c15250c080b1d0214a4c65ac3
parent 09d85677c32b0c5c89bbeba4d4f08850d0b85a28
parent 466ceb463f44f72bdd73764e50dcb34c174a0cfe
author Robert Greenwalt <rgreenwalt@google.com> 1369801544 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1369801544 -0700

am 466ceb46: am aa4b2ee0: Merge "Ignore outstanding delayed shutdown on restart" into jb-mr2-dev

* commit '466ceb463f44f72bdd73764e50dcb34c174a0cfe':
  Ignore outstanding delayed shutdown on restart