Merge branch 'devel/master(1.2.18)' into tizen 69/104469/1
authorsuhyung Eom <suhyung.eom@samsung.com>
Tue, 13 Dec 2016 10:22:26 +0000 (19:22 +0900)
committersuhyung Eom <suhyung.eom@samsung.com>
Tue, 13 Dec 2016 10:23:36 +0000 (19:23 +0900)
commit35a4607d061b508df97355c994c36e198c0ba38e
tree2c9030abec1fad3b6c92a3d8bd663d977402567d
parenta89d1c7e2bd728a8eb64a66bb605fea7f0788d84
parent47e17470800b4bcab25392466a3a7e6bbf7274d8
Merge branch 'devel/master(1.2.18)' into tizen

Change-Id: I838cb7bf1b9c2b710822e4daec885428bff7f9db