Merge branch 'devel/master' into tizen 14/62914/1 accepted/tizen/common/20160323.184908 accepted/tizen/ivi/20160323.140655 accepted/tizen/mobile/20160323.135050 accepted/tizen/tv/20160323.135500 accepted/tizen/wearable/20160323.135159 submit/tizen/20160323.065919
authorminho.sun <minho.sun@samsung.com>
Mon, 21 Mar 2016 02:51:25 +0000 (11:51 +0900)
committerminho.sun <minho.sun@samsung.com>
Mon, 21 Mar 2016 05:49:40 +0000 (14:49 +0900)
Change-Id: Ifebc446e0b9318cf264a8065fdd044cb4961ab85


Trivial merge