Merge branch 'develop' into platform_3.0
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Tue, 26 Jul 2016 04:22:57 +0000 (13:22 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Tue, 26 Jul 2016 04:23:08 +0000 (13:23 +0900)
Change-Id: I77973f66f1e92aaf3c0e87e6b5362b7814cc0c91
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

Trivial merge