Merge branch 'devel' into tizen 07/53507/1 accepted/tizen/mobile/20151207.123550 accepted/tizen/tv/20151207.123609 accepted/tizen/wearable/20151207.123630 submit/tizen/20151207.055555
authorBoram Park <boram1288.park@samsung.com>
Mon, 7 Dec 2015 11:05:49 +0000 (20:05 +0900)
committerBoram Park <boram1288.park@samsung.com>
Mon, 7 Dec 2015 11:05:53 +0000 (20:05 +0900)
Change-Id: I46f69bf79e51f8ae8f40b48d5ccd35b56f10ca9b


Trivial merge