Joe Onorato 5747eebf6e am a8d477f0: Merge "Pressing the power button quickly needs to turn the screen on and off correctly." into gingerbread ...

Merge commit 'a8d477f0d7fd0cf01c47e37c59f26c5fa4d1cf42' into gingerbread-plus-aosp

* commit 'a8d477f0d7fd0cf01c47e37c59f26c5fa4d1cf42':
  Pressing the power button quickly needs to turn the screen on and off correctly.

2010-10-18 13:16:42 -07:00

..

com/android/server

am a8d477f0: Merge "Pressing the power button quickly needs to turn the screen on and off correctly." into gingerbread

2010-10-18 13:16:42 -07:00

Android.mk

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

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