OSDN Git Service

resolve merge conflicts of 383cc530492e to master
authorSelim Cinek <cinek@google.com>
Thu, 8 Jun 2017 01:44:53 +0000 (18:44 -0700)
committerSelim Cinek <cinek@google.com>
Thu, 8 Jun 2017 01:44:53 +0000 (18:44 -0700)
commit9eae838a099547396437ce9a9aa7999f54d2c6c4
tree5e5d72e33adecd817c8c56459a93e876468a1303
parent842a51d8e8bdfd83941f3eb31ace08f7c3c4ce3a
parent383cc530492e18f5afec934fdaf193b75c691973
resolve merge conflicts of 383cc530492e to master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I52ee72a7e09792c604eb7cb4a76a6657f808e720
packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconContainer.java
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java