Merge branch 'develop' into tizen_3.0
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Thu, 16 Jun 2016 10:25:16 +0000 (19:25 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Thu, 16 Jun 2016 10:26:08 +0000 (19:26 +0900)
Change-Id: I72fc42f348745bd69d42437a91e0e7477b7e22cb
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

Trivial merge