Merge branch 'develop' into develop_qemu_2.6
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Mon, 20 Jun 2016 06:25:48 +0000 (15:25 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Mon, 20 Jun 2016 06:26:04 +0000 (15:26 +0900)
Change-Id: Ic166886aa338b0d927bcd9a56cb81f6fb6afa0d6


Trivial merge