Commit 37970ac2 authored Jul 25, 2014 by Jinsuk Kim Committed by Android Git Automerger Jul 25, 2014

am 46d2cb78: am 20f25011: Merge "MHL controller for subcommand reception" into lmp-dev

* commit '46d2cb7870682ee3feb99006b340e2fbfded12d2':
  MHL controller for subcommand reception

services/core/jni/com_android_server_hdmi_HdmiCecController.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -18,8 +18,8 @@

		#define LOG_NDEBUG 1

		#include "JNIHelp.h"
		#include "ScopedPrimitiveArray.h"
		#include <JNIHelp.h>
		#include <ScopedPrimitiveArray.h>

		#include <cstring>