Joe Onorato 14854820ea am c0ad216c: Merge "Add a configuration option to turn on the screen when you unplug the device." into gingerbread ...

Merge commit 'c0ad216c8ebc74b59074a7538533605eebfd65c3' into gingerbread-plus-aosp

* commit 'c0ad216c8ebc74b59074a7538533605eebfd65c3':
  Add a configuration option to turn on the screen when you unplug the device.

2010-10-11 15:22:30 -07:00

..

com

am c0ad216c: Merge "Add a configuration option to turn on the screen when you unplug the device." into gingerbread

2010-10-11 15:22:30 -07:00

Android.mk

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

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