Merge "Fix system audio mode failure in boot up" into lmp-dev

author Jungshik Jang <jayjang@google.com>

Fri, 29 Aug 2014 06:28:12 +0000 (06:28 +0000)

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

Fri, 29 Aug 2014 06:28:14 +0000 (06:28 +0000)
author Jungshik Jang <jayjang@google.com>
Fri, 29 Aug 2014 06:28:12 +0000 (06:28 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 29 Aug 2014 06:28:14 +0000 (06:28 +0000)
diff --cc services/core/java/com/android/server/hdmi/HdmiCecController.java
Simple merge
author	Jungshik Jang <jayjang@google.com>
	Fri, 29 Aug 2014 06:28:12 +0000 (06:28 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 29 Aug 2014 06:28:14 +0000 (06:28 +0000)