Merge branch 'devel/master' into tizen 76/97776/1
authordongsug.song <dongsug.song@samsung.com>
Tue, 15 Nov 2016 03:36:06 +0000 (12:36 +0900)
committerdongsug.song <dongsug.song@samsung.com>
Tue, 15 Nov 2016 03:36:33 +0000 (12:36 +0900)
Change-Id: Ia2109e5d9b3985b4f9a4f59d8bd861bd94e51b67


Trivial merge