OSDN Git Service

resolve merge conflicts of ce40da80701a to master
authorSelim Cinek <cinek@google.com>
Wed, 7 Jun 2017 21:42:20 +0000 (14:42 -0700)
committerSelim Cinek <cinek@google.com>
Wed, 7 Jun 2017 21:42:20 +0000 (14:42 -0700)
commit6d48d60f35f6e4a9102684b4d669eecfa84a68e9
treec5fa1f39b502d2a1ddda6de4490d54978d200f40
parent842a51d8e8bdfd83941f3eb31ace08f7c3c4ce3a
parentce40da80701af635249faf0becb8ec5f6a9f9883
resolve merge conflicts of ce40da80701a to master

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