Merge "Update TV to show custom actions." into oc-dev

author Winson Chung <winsonc@google.com>

Thu, 15 Jun 2017 21:05:44 +0000 (21:05 +0000)

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

Thu, 15 Jun 2017 21:06:14 +0000 (21:06 +0000)
author Winson Chung <winsonc@google.com>
Thu, 15 Jun 2017 21:05:44 +0000 (21:05 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 15 Jun 2017 21:06:14 +0000 (21:06 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java
Simple merge
diff --cc packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java
Simple merge
author	Winson Chung <winsonc@google.com>
	Thu, 15 Jun 2017 21:05:44 +0000 (21:05 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 15 Jun 2017 21:06:14 +0000 (21:06 +0000)
		1	2
packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java	patch \|	diff1 \|	diff2 \|	blob \| history