Merge "Remove redundant IMM#mServedInputConnection." into nyc-dev

author Yohei Yukawa <yukawa@google.com>

Wed, 23 Mar 2016 05:41:07 +0000 (05:41 +0000)

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

Wed, 23 Mar 2016 05:41:08 +0000 (05:41 +0000)
author Yohei Yukawa <yukawa@google.com>
Wed, 23 Mar 2016 05:41:07 +0000 (05:41 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 23 Mar 2016 05:41:08 +0000 (05:41 +0000)
diff --cc core/java/android/view/inputmethod/InputMethodManager.java
Simple merge
author	Yohei Yukawa <yukawa@google.com>
	Wed, 23 Mar 2016 05:41:07 +0000 (05:41 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 23 Mar 2016 05:41:08 +0000 (05:41 +0000)