am c104e1b3: am dc656339: am 991475a2: Merge change I0e419fcf into eclair

Merge commit 'c104e1b3912f1389848b0cc841866564d9314287'

* commit 'c104e1b3912f1389848b0cc841866564d9314287':
  Add isScreenOn() to LocalPowerManager interface so we can call it from PhoneWindowManager

core/java/android/os/LocalPowerManager.java

@@ -45,4 +45,6 @@ public interface LocalPowerManager {
 
     // the same as the method on PowerManager
     public void userActivity(long time, boolean noChangeLights, int eventType);
+
+    boolean isScreenOn();
 }