diff -rupN camera-hal.org/QCamera2/HAL/CameraParameters.cpp camera-hal/QCamera2/HAL/CameraParameters.cpp
--- camera-hal.org/QCamera2/HAL/CameraParameters.cpp	2014-01-08 15:49:52.414501770 -0800
+++ camera-hal/QCamera2/HAL/CameraParameters.cpp	2014-01-08 15:53:38.425103802 -0800
@@ -1,4 +1,23 @@
 /*
+Copyright (c) 2014, The Linux Foundation. All rights reserved.
+Not a Contribution.
+
+Copyright 2008, The Android Open Source Project
+
+Licensed under the Apache License, Version 2.0 (the "License"); you
+may not use this file except in compliance with the License.  You may
+obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied.  See the License for the specific language governing
+permissions and limitations under the License
+*/
+
+/*
 **
 ** Copyright 2008, The Android Open Source Project
 **
@@ -16,11 +35,19 @@
 */

 #define LOG_TAG "CameraParams"
-#include <utils/Log.h>
+
+#if defined(USE_DLOG)
+  #include <dlog/dlog.h>
+#else
+  #include <utils/Log.h>
+#endif
+
+#include <stdio.h>
+#include <unistd.h>

 #include <string.h>
 #include <stdlib.h>
-#include <camera/CameraParameters.h>
+#include "CameraParameters.h"

 namespace android {
 // Parameter keys to communicate between camera application and driver.
