tree 028086af264a1d96a17a8623d823a1923ba12af9
parent 6e8d3ab4dade88ebfe76040d407cc423f983c0bd
parent c7e64a8e4bd950b615675f7dce0a0f411f568c7e
author Mike Lockwood <lockwood@android.com> 1273784670 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273784670 -0700

am 098e58da: Use SystemClock.elapsedRealtime in ShutdownThread timeout logic

Merge commit '098e58da93f304d7d7791f193c6237870b94989d' into froyo-plus-aosp

* commit '098e58da93f304d7d7791f193c6237870b94989d':
  Use SystemClock.elapsedRealtime in ShutdownThread timeout logic