Merge branch 'develop' into platform_3.0
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Mon, 22 Aug 2016 06:56:41 +0000 (15:56 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Mon, 22 Aug 2016 06:56:43 +0000 (15:56 +0900)
Change-Id: I04466973e474948e282e3ff1e0e76b1e9f9e6376
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

Trivial merge