| commit | baaf790873f14893a7395694b634c1e6f4367072 | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Fri Nov 20 15:04:31 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 20 15:04:31 2009 -0800 |
| tree | 033d1611859f340e93116a4d93a0f3c1d56047e2 | |
| parent | c272ce3d374925d613bd61c091fe367459df33bd [diff] | |
| parent | 8b5e7153a53bc004f500a70194a00059cab7925f [diff] |
am 79ff03a8: Merge change I3ae1fb19 into eclair-mr2 Merge commit '79ff03a84b8f6aa9fc95fba728a131e9c88d1b47' into eclair-mr2-plus-aosp * commit '79ff03a84b8f6aa9fc95fba728a131e9c88d1b47': Increase the default wake lock timeout.