Jim Miller d0861c8992 am 3d7a9707: Merge "Fix 3210299: Extend lock screen wake timeout to 10s" into honeycomb
* commit '3d7a9707a58bb043147f30dc81c61deeeffeeef7':
  Fix 3210299: Extend lock screen wake timeout to 10s
2011-01-17 17:03:51 -08:00
..