Merge "AVRCP: Fix NPE in removeMediaController" into oc-dev

author Marie Janssen <jamuraa@google.com>

Thu, 4 May 2017 19:54:13 +0000 (19:54 +0000)

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

Thu, 4 May 2017 19:54:14 +0000 (19:54 +0000)
author Marie Janssen <jamuraa@google.com>
Thu, 4 May 2017 19:54:13 +0000 (19:54 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 4 May 2017 19:54:14 +0000 (19:54 +0000)
diff --cc src/com/android/bluetooth/avrcp/Avrcp.java
Simple merge
author	Marie Janssen <jamuraa@google.com>
	Thu, 4 May 2017 19:54:13 +0000 (19:54 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 4 May 2017 19:54:14 +0000 (19:54 +0000)