OSDN Git Service

Merge "AOD: Fix wakeAndUnlockPulsing transition" into oc-dev am: 838e365581
authorAdrian Roos <roosa@google.com>
Wed, 24 May 2017 22:18:43 +0000 (22:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 24 May 2017 22:18:43 +0000 (22:18 +0000)
commit5c0a17ce9aa0040ca3862a8502eb5c00643eb3c9
treeabf876a2972e2a22067ddece18ed00118ec7628b
parente1612d04de3bef0e970165ea80aebb6fba392240
parente90d58ed09b90b84f2f578839f0d4e2d9760f246
Merge "AOD: Fix wakeAndUnlockPulsing transition" into oc-dev am: 838e365581
am: e90d58ed09

Change-Id: I93ab6feaf0b4fd36fa80fdc48878a5c71df70e26
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java