diff options
| author | Jinsuk Kim <jinsukkim@google.com> | 2014-07-25 23:29:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-25 23:29:32 +0000 |
| commit | 99f6dde22c15f2c7207c004426c10630f2868ee0 (patch) | |
| tree | f94514924801d57df3a60bfbe65928ddec9842de /services | |
| parent | 3480d903f2afea8fc23a7d4f17d30d1aff80584e (diff) | |
| parent | 37970ac22af64bf0be99a133f5cec368f1729639 (diff) | |
| download | frameworks_base-99f6dde22c15f2c7207c004426c10630f2868ee0.zip frameworks_base-99f6dde22c15f2c7207c004426c10630f2868ee0.tar.gz frameworks_base-99f6dde22c15f2c7207c004426c10630f2868ee0.tar.bz2 | |
am 2b08afab: am 46d2cb78: am 20f25011: Merge "MHL controller for subcommand reception" into lmp-dev
* commit '2b08afabfcb6f09c732a3a6a36d550b1ba4d2742':
MHL controller for subcommand reception
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/jni/com_android_server_hdmi_HdmiCecController.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/jni/com_android_server_hdmi_HdmiCecController.cpp b/services/core/jni/com_android_server_hdmi_HdmiCecController.cpp index 47f83d0..5c557b6 100644 --- a/services/core/jni/com_android_server_hdmi_HdmiCecController.cpp +++ b/services/core/jni/com_android_server_hdmi_HdmiCecController.cpp @@ -18,8 +18,8 @@ #define LOG_NDEBUG 1 -#include "JNIHelp.h" -#include "ScopedPrimitiveArray.h" +#include <JNIHelp.h> +#include <ScopedPrimitiveArray.h> #include <cstring> |