Merge "Clean up MHL local devices when HdmiControlService turns into disabled state...

author Jungshik Jang <jayjang@google.com>

Wed, 20 Aug 2014 01:19:12 +0000 (01:19 +0000)

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

Sat, 16 Aug 2014 04:12:14 +0000 (04:12 +0000)
author Jungshik Jang <jayjang@google.com>
Wed, 20 Aug 2014 01:19:12 +0000 (01:19 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Sat, 16 Aug 2014 04:12:14 +0000 (04:12 +0000)
diff --cc services/core/java/com/android/server/hdmi/HdmiControlService.java
Simple merge
author	Jungshik Jang <jayjang@google.com>
	Wed, 20 Aug 2014 01:19:12 +0000 (01:19 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sat, 16 Aug 2014 04:12:14 +0000 (04:12 +0000)