Merge branch 'tizen_2.3_develop' into tizen_2.3_multi
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Fri, 12 Jun 2015 11:56:19 +0000 (20:56 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Fri, 12 Jun 2015 11:56:49 +0000 (20:56 +0900)
Change-Id: I7964fa8d9144e4d67a53f5277dfcb496cf61ba3b


Trivial merge