Merge branch 'devel/master (1.2.31)' into tizen 92/119692/1
authorHeeyong Song <heeyong.song@samsung.com>
Mon, 20 Mar 2017 02:04:49 +0000 (11:04 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Mon, 20 Mar 2017 02:07:11 +0000 (11:07 +0900)
Change-Id: Ibbbdf9d0225f429df8fea4e479d56999bc3782c0


Trivial merge