Merge branch 'devel/master' into tizen 75/72275/1
authorsuhyung Eom <suhyung.eom@samsung.com>
Tue, 31 May 2016 08:58:44 +0000 (17:58 +0900)
committersuhyung Eom <suhyung.eom@samsung.com>
Tue, 31 May 2016 08:59:08 +0000 (17:59 +0900)
Change-Id: Ie43a9ae8376489e2dc67bff9ab1c416c14602afb


Trivial merge