| commit | 39cabc69d0afc7cb28541dcd3fada217d3ce3e58 | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Fri Nov 20 15:30:51 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 20 15:30:51 2009 -0800 |
| tree | c44d535c0fc82642cf831a162c224f0263a3ef70 | |
| parent | 710ac46b0d53b61c2de3f110c2fb96f0155d3dfd [diff] | |
| parent | 2111be3f9c1059222c08814e81de6ab55be222c0 [diff] |
am 2111be3f: am 79ff03a8: Merge change I3ae1fb19 into eclair-mr2 Merge commit '2111be3f9c1059222c08814e81de6ab55be222c0' * commit '2111be3f9c1059222c08814e81de6ab55be222c0': Increase the default wake lock timeout.