Merge branch 'tizen' into devel/tizen_3.0 75/53875/1
authorMu-Woong Lee <muwoong.lee@samsung.com>
Thu, 10 Dec 2015 02:59:57 +0000 (11:59 +0900)
committerMu-Woong Lee <muwoong.lee@samsung.com>
Thu, 10 Dec 2015 02:59:57 +0000 (11:59 +0900)
Change-Id: Ic2057d25073ee284540437af044fde08ee996695
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>

Trivial merge