Merge "Make sure we can properly shutdown even if" into ics-mr1

This commit is contained in:
Andreas Huber 2011-11-29 14:09:10 -08:00 committed by Android (Google) Code Review
commit 8f2b02be3c

Diff Content Not Available