Merge branch 'tizen_3.0_develop' into tizen_3.0
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Fri, 6 Nov 2015 13:23:59 +0000 (22:23 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Fri, 6 Nov 2015 13:24:15 +0000 (22:24 +0900)
Change-Id: I900daf95959a7a942c589e1abc57a8f9978b6efb
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

Trivial merge