Merge branch 'tizen_3.0_qemu_2.5' into tizen_3.0_develop
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Wed, 30 Dec 2015 02:24:57 +0000 (11:24 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Wed, 30 Dec 2015 02:25:16 +0000 (11:25 +0900)
Change-Id: I2fe88ade2a861c3c07bfa8c9d3aafb6fb59a3ac2
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

Trivial merge