| commit | 466ceb463f44f72bdd73764e50dcb34c174a0cfe | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Tue May 28 21:23:11 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 28 21:23:11 2013 -0700 |
| tree | 68e2f890b41eaba3518df6f93a3bf7ffa00a1b44 | |
| parent | e3425ac426fa5da15fa3d8471dd9c0e27cb52375 [diff] | |
| parent | aa4b2ee0d654b345b727cb47afd246d0b769fafd [diff] |
am aa4b2ee0: Merge "Ignore outstanding delayed shutdown on restart" into jb-mr2-dev * commit 'aa4b2ee0d654b345b727cb47afd246d0b769fafd': Ignore outstanding delayed shutdown on restart