Merge commit '098e58da93f304d7d7791f193c6237870b94989d' into froyo-plus-aosp * commit '098e58da93f304d7d7791f193c6237870b94989d': Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
Merge commit '098e58da93f304d7d7791f193c6237870b94989d' into froyo-plus-aosp * commit '098e58da93f304d7d7791f193c6237870b94989d': Use SystemClock.elapsedRealtime in ShutdownThread timeout logic