commit | 5a9cbb291fa7505a6c51eba6f600009dfc17366d | [log] [tgz] |
---|---|---|
author | Mike Lockwood <lockwood@android.com> | Thu May 13 14:06:25 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 13 14:06:25 2010 -0700 |
tree | 366967965e321597c96e9ffc9e81a6c3bab96016 | |
parent | 54a8f2952341e39685c920e9be43e57d33e4b01b [diff] | |
parent | a3d5549c802bc4fbf1e1ca05bc3552db17212036 [diff] |
am a3d5549c: am 098e58da: Use SystemClock.elapsedRealtime in ShutdownThread timeout logic Merge commit 'a3d5549c802bc4fbf1e1ca05bc3552db17212036' into kraken * commit 'a3d5549c802bc4fbf1e1ca05bc3552db17212036': Use SystemClock.elapsedRealtime in ShutdownThread timeout logic