am 258d0e80: am 0d65a3fc: Merge "Screen on/off animation tweaks" into gingerbread

Merge commit '258d0e805ee63685b807b5dae43efc5ecc97179e'

* commit '258d0e805ee63685b807b5dae43efc5ecc97179e':
  Screen on/off animation tweaks