Merge branch 'develop' into platform_3.0
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Tue, 23 Aug 2016 06:44:41 +0000 (15:44 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Tue, 23 Aug 2016 06:44:46 +0000 (15:44 +0900)
Change-Id: I3da87b8d492d6beb8ac20345d5616f05f4656114
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

Trivial merge