Merge branch 'devel/master (1.2.31)' into tizen 18/119718/1
authorHeeyong Song <heeyong.song@samsung.com>
Mon, 20 Mar 2017 02:18:24 +0000 (11:18 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Mon, 20 Mar 2017 02:18:39 +0000 (11:18 +0900)
Change-Id: I2299bb458b68e615f1f3d69f38a9481bb6b5c7be


Trivial merge