tree c632dee7f3925de82ef396d1b2d0a2dfe6d6e636
parent 743e25c914b26dc329c8f2c03306b488f320dbe7
parent 702b8752a5038dc307dc77d157124204f8ad8aa4
author Mike Lockwood <lockwood@android.com> 1273784986 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273784986 -0700

am 702b8752: am 5a9cbb29: am a3d5549c: am 098e58da: Use SystemClock.elapsedRealtime in ShutdownThread timeout logic