commit | aa4b2ee0d654b345b727cb47afd246d0b769fafd | [log] [tgz] |
---|---|---|
author | Robert Greenwalt <rgreenwalt@google.com> | Wed May 29 04:21:24 2013 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed May 29 04:21:25 2013 +0000 |
tree | 1d6fd51ba5370126e25918a1905445cf28962665 | |
parent | af1e512e3f2b52e563e37c1635cbea06e87e0592 [diff] | |
parent | e9868c1ba05b6b8d3be94df1e5cbd0a5d016b0a7 [diff] |
Merge "Ignore outstanding delayed shutdown on restart" into jb-mr2-dev