Merge branch 'devel/master' into tizen 51/159951/1 accepted/tizen/unified/20171117.124950 submit/tizen/20171115.014233 submit/tizen/20171115.054905
authorHeeyong Song <heeyong.song@samsung.com>
Tue, 14 Nov 2017 01:38:58 +0000 (10:38 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Tue, 14 Nov 2017 01:39:04 +0000 (10:39 +0900)
Change-Id: I4c70a11af795eb70107ad30c171dd347341a7e26


Trivial merge