OSDN Git Service

resolved conflicts for merge of 4f8cd188 to master
authorJeff Brown <jeffbrown@google.com>
Fri, 2 May 2014 01:19:31 +0000 (18:19 -0700)
committerJeff Brown <jeffbrown@google.com>
Fri, 2 May 2014 01:19:31 +0000 (18:19 -0700)
commitfb0448ab4b42c1b390cd75c3660ec0de511b7b3b
tree157dff51891fa740fb36afe2c1f3e1e986dc7ec9
parent615d1337fcb4b7e16706e615b19305eea7b689bb
parent4f8cd18880f1a63d2db376c3bfbfe11c55e6f1ee
resolved conflicts for merge of 4f8cd188 to master

Change-Id: I148cd616cd14d834915978aa2dc3f9e27188dbd3
core/java/android/view/WindowManagerPolicy.java
packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
services/core/java/com/android/server/power/Notifier.java