Merge branch 'devel/master' into tizen 86/68386/1 accepted/tizen/common/20160509.135208 accepted/tizen/ivi/20160510.002649 accepted/tizen/mobile/20160510.002552 accepted/tizen/tv/20160510.002617 accepted/tizen/wearable/20160510.002523 submit/tizen/20160509.092357
authordongsug.song <dongsug.song@samsung.com>
Wed, 4 May 2016 00:09:16 +0000 (09:09 +0900)
committerdongsug.song <dongsug.song@samsung.com>
Wed, 4 May 2016 00:09:40 +0000 (09:09 +0900)
Change-Id: Ie7b8cfa4cd8adee13b52fd3bb3ad09fa39bdd1fe
Signed-off-by: dongsug.song <dongsug.song@samsung.com>

Trivial merge