Merge branch 'devel/master' into tizen 74/68374/1
authordongsug.song <dongsug.song@samsung.com>
Tue, 3 May 2016 23:49:17 +0000 (08:49 +0900)
committerdongsug.song <dongsug.song@samsung.com>
Tue, 3 May 2016 23:49:45 +0000 (08:49 +0900)
Change-Id: I96969c8c967c144c5b34ac481e19c5d7f5056618
Signed-off-by: dongsug.song <dongsug.song@samsung.com>

Trivial merge