Merge branch 'tizen_3.0_develop' into tizen_3.0
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Fri, 30 Oct 2015 04:58:20 +0000 (13:58 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Fri, 30 Oct 2015 04:58:20 +0000 (13:58 +0900)
Change-Id: I9c79f0f5daee8d420c58392d8ea67f7ea02528cd
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

Trivial merge