Merge "Add additional guards to ensure input consumer is re-registered."

author TreeHugger Robot <treehugger-gerrit@google.com>

Fri, 13 Jan 2017 20:21:30 +0000 (20:21 +0000)

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

Fri, 13 Jan 2017 20:21:33 +0000 (20:21 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Fri, 13 Jan 2017 20:21:30 +0000 (20:21 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 13 Jan 2017 20:21:33 +0000 (20:21 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivityController.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Fri, 13 Jan 2017 20:21:30 +0000 (20:21 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 13 Jan 2017 20:21:33 +0000 (20:21 +0000)