Merging tizen into ckm. Stage 2.

Merged commit '7019d2b04887994ff0f87ab8020cc367ffe1994a' into ckm

Change-Id: I80f23e4825da2bb7167d43863e6ed1331a5f5776

diff --cc CMakeLists.txt
Simple merge

diff --cc src/CMakeLists.txt
index df2812a,b3c75e6..94eef00
--- 1/src/CMakeLists.txt
--- 2/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -1,4 -1,4 +1,4 @@@
- # Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
 -# Copyright (c) 2011-2015 Samsung Electronics Co., Ltd All Rights Reserved
++# Copyright (c) 2014-2015 Samsung Electronics Co., Ltd All Rights Reserved
  #
  #    Licensed under the Apache License, Version 2.0 (the "License");
  #    you may not use this file except in compliance with the License.

diff --cc src/ckm/CMakeLists.txt
Simple merge