Merge "Add HDMI-CEC service" into klp-modular-dev

author Jinsuk Kim <jinsukkim@google.com>

Fri, 21 Mar 2014 02:32:38 +0000 (02:32 +0000)

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

Fri, 21 Mar 2014 02:32:38 +0000 (02:32 +0000)
author Jinsuk Kim <jinsukkim@google.com>
Fri, 21 Mar 2014 02:32:38 +0000 (02:32 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 21 Mar 2014 02:32:38 +0000 (02:32 +0000)
diff --cc api/current.txt
Simple merge
diff --cc services/java/com/android/server/SystemServer.java
Simple merge
author	Jinsuk Kim <jinsukkim@google.com>
	Fri, 21 Mar 2014 02:32:38 +0000 (02:32 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 21 Mar 2014 02:32:38 +0000 (02:32 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
services/java/com/android/server/SystemServer.java	patch \|	diff1 \|	diff2 \|	blob \| history