| commit | 99857146561ea16fca840d92e73325509cf7894c | [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 | a13d48546e925a991a65ce55ecbe7cecdb4d8ad2 | |
| parent | e33192c207d407f0952814f52eb63ffad830db19 [diff] | |
| parent | a5cdbc86b323ee5e02ce4f77891d02a7dce43ff7 [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