OSDN Git Service

Merge "add a log for peek to shade expansion" into oc-dev
authorChris Wren <cwren@google.com>
Thu, 15 Jun 2017 16:28:32 +0000 (16:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 15 Jun 2017 16:28:32 +0000 (16:28 +0000)
commit4bf303695b3d869a0be0f1b13defab7167c5b975
tree5fc0d5fa7c8c339be5033af97323ecd992d92db3
parente836b7d8e5a17ce5b8fffaff3639e8c9dc4656c3
parent04298759fe956ce712a84d7df049e14c1815cb07
Merge "add a log for peek to shade expansion" into oc-dev
am: 04298759fe

Change-Id: I4813fcd717b966e2ed2b1835d12d4183633f60ff
packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
services/core/java/com/android/server/notification/NotificationManagerService.java