Merge branch 'develop' into tizen_3.0
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Thu, 9 Jun 2016 05:47:36 +0000 (14:47 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Thu, 9 Jun 2016 05:47:55 +0000 (14:47 +0900)
Change-Id: Ic9c5d8c2a5db40d7f7b5323f3e6b7d775a433deb
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

Trivial merge