| commit | b61e757ffbe1c5cc05ca039f548ea4ce3bcb070f | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Tue May 28 21:25:44 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 28 21:25:44 2013 -0700 |
| tree | 4df5728bd54cf65c15250c080b1d0214a4c65ac3 | |
| parent | 09d85677c32b0c5c89bbeba4d4f08850d0b85a28 [diff] | |
| parent | 466ceb463f44f72bdd73764e50dcb34c174a0cfe [diff] |
am 466ceb46: am aa4b2ee0: Merge "Ignore outstanding delayed shutdown on restart" into jb-mr2-dev * commit '466ceb463f44f72bdd73764e50dcb34c174a0cfe': Ignore outstanding delayed shutdown on restart