| commit | 2111be3f9c1059222c08814e81de6ab55be222c0 | [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 | 115ab70c40772631f247b97a37b6b556171fe7b5 | |
| parent | 10a02fb7e44dfd50132386e04f39b35b00b84e0e [diff] | |
| parent | 79ff03a84b8f6aa9fc95fba728a131e9c88d1b47 [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.