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)
commitded5b3f4f93d5cc722178bee9ef8b40e5c373d40
tree26f6558b7de3a7c3c8887ef9ede186475548a2c7
parent9b4b743f3b827a03da9fd6bba7e8a1fc83842af9
parent022fe75f8e0486681b090b9c456f98ae762c4384
Merge branch 'devel/master' into tizen

Change-Id: I96969c8c967c144c5b34ac481e19c5d7f5056618
Signed-off-by: dongsug.song <dongsug.song@samsung.com>