Joe Onorato 17350886d0 am d3f6c1fa: am 0c39b6c6: Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into gingerbread ...

Merge commit 'd3f6c1fa45d0b9aaf467159953ee4bea2ea89188'

* commit 'd3f6c1fa45d0b9aaf467159953ee4bea2ea89188':
  Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.

2010-07-28 11:05:29 -07:00

..

com/android/server

am d3f6c1fa: am 0c39b6c6: Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into gingerbread

2010-07-28 11:05:29 -07:00

Android.mk

disable emma instrumentation for framework, ext and services (DO NOT MERGE)

2010-05-18 16:02:28 -07:00