Merge branch 'devel/master' into tizen 85/68385/1 accepted/tizen/common/20160509.135143 accepted/tizen/ivi/20160510.002628 accepted/tizen/mobile/20160510.002532 accepted/tizen/tv/20160510.002557 accepted/tizen/wearable/20160510.002501 submit/tizen/20160509.092357
authordongsug.song <dongsug.song@samsung.com>
Wed, 4 May 2016 00:05:01 +0000 (09:05 +0900)
committerdongsug.song <dongsug.song@samsung.com>
Wed, 4 May 2016 00:05:27 +0000 (09:05 +0900)
Change-Id: I570b7241cb3a0a15ae5398357ab3952954f2915b
Signed-off-by: dongsug.song <dongsug.song@samsung.com>

Trivial merge