Wink Saville 39cabc69d0 am 2111be3f: am 79ff03a8: Merge change I3ae1fb19 into eclair-mr2
Merge commit '2111be3f9c1059222c08814e81de6ab55be222c0'

* commit '2111be3f9c1059222c08814e81de6ab55be222c0':
  Increase the default wake lock timeout.
2009-11-20 15:30:51 -08:00
..