Merge "Use correct binding flags when reconnecting to IME" into oc-dev

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

Sat, 1 Apr 2017 00:06:57 +0000 (00:06 +0000)

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

Sat, 1 Apr 2017 00:07:00 +0000 (00:07 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Sat, 1 Apr 2017 00:06:57 +0000 (00:06 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Sat, 1 Apr 2017 00:07:00 +0000 (00:07 +0000)
diff --cc services/core/java/com/android/server/InputMethodManagerService.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Sat, 1 Apr 2017 00:06:57 +0000 (00:06 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sat, 1 Apr 2017 00:07:00 +0000 (00:07 +0000)