Merge "TIF: handle HDMI CEC power status change" into lmp-dev

author Wonsik Kim <wonsik@google.com>

Thu, 14 Aug 2014 01:08:55 +0000 (01:08 +0000)

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

Tue, 12 Aug 2014 23:14:42 +0000 (23:14 +0000)
author Wonsik Kim <wonsik@google.com>
Thu, 14 Aug 2014 01:08:55 +0000 (01:08 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 12 Aug 2014 23:14:42 +0000 (23:14 +0000)
diff --cc services/core/java/com/android/server/tv/TvInputManagerService.java
Simple merge
author	Wonsik Kim <wonsik@google.com>
	Thu, 14 Aug 2014 01:08:55 +0000 (01:08 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 12 Aug 2014 23:14:42 +0000 (23:14 +0000)