Merge branch 'devel/tizen_3.0' into tizen 37/54837/1 submit/tizen/20151218.070016
authorMu-Woong Lee <muwoong.lee@samsung.com>
Fri, 18 Dec 2015 06:26:36 +0000 (15:26 +0900)
committerMu-Woong Lee <muwoong.lee@samsung.com>
Fri, 18 Dec 2015 06:26:36 +0000 (15:26 +0900)
Change-Id: I219270822e12b6a6d549f6f0a665f0acab2ebd2e
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>

Trivial merge