Merge "Fix difference in icon size for quick QS" into nyc-dev

author Jason Monk <jmonk@google.com>

Tue, 1 Mar 2016 20:10:22 +0000 (20:10 +0000)

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

Tue, 1 Mar 2016 20:10:24 +0000 (20:10 +0000)
author Jason Monk <jmonk@google.com>
Tue, 1 Mar 2016 20:10:22 +0000 (20:10 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 1 Mar 2016 20:10:24 +0000 (20:10 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
Simple merge
diff --cc packages/SystemUI/src/com/android/systemui/qs/QSTileBaseView.java
Simple merge
author	Jason Monk <jmonk@google.com>
	Tue, 1 Mar 2016 20:10:22 +0000 (20:10 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 1 Mar 2016 20:10:24 +0000 (20:10 +0000)
		1	2
packages/SystemUI/src/com/android/systemui/qs/QSPanel.java	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/qs/QSTileBaseView.java	patch \|	diff1 \|	diff2 \|	blob \| history