Merge "Adapted the measuring of notification content view" into nyc-dev

author Selim Cinek <cinek@google.com>

Fri, 19 Feb 2016 23:03:58 +0000 (23:03 +0000)

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

Fri, 19 Feb 2016 23:03:59 +0000 (23:03 +0000)
author Selim Cinek <cinek@google.com>
Fri, 19 Feb 2016 23:03:58 +0000 (23:03 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 19 Feb 2016 23:03:59 +0000 (23:03 +0000)
diff --cc packages/SystemUI/res/values/dimens.xml
Simple merge
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
Simple merge
author	Selim Cinek <cinek@google.com>
	Fri, 19 Feb 2016 23:03:58 +0000 (23:03 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 19 Feb 2016 23:03:59 +0000 (23:03 +0000)
		1	2
packages/SystemUI/res/values/dimens.xml	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java	patch \|	diff1 \|	diff2 \|	blob \| history