Merge "Reset the notification expanded states on screen off" into lmp-dev

author Selim Cinek <cinek@google.com>

Wed, 13 Aug 2014 13:46:55 +0000 (13:46 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 12 Aug 2014 23:14:48 +0000 (23:14 +0000)
author Selim Cinek <cinek@google.com>
Wed, 13 Aug 2014 13:46:55 +0000 (13:46 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 12 Aug 2014 23:14:48 +0000 (23:14 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
Simple merge
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Simple merge
author	Selim Cinek <cinek@google.com>
	Wed, 13 Aug 2014 13:46:55 +0000 (13:46 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 12 Aug 2014 23:14:48 +0000 (23:14 +0000)
		1	2
packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java	patch \|	diff1 \|	diff2 \|	blob \| history