Merge branch 'master' into tizen accepted/tizen/common/20160404.123550 accepted/tizen/ivi/20160405.012305 accepted/tizen/mobile/20160405.012215 accepted/tizen/tv/20160405.012237 accepted/tizen/wearable/20160405.012248 submit/tizen/20160404.045623
authorHyunjin Park <hj.na.park@samsung.com>
Mon, 4 Apr 2016 04:45:00 +0000 (13:45 +0900)
committerHyunjin Park <hj.na.park@samsung.com>
Mon, 4 Apr 2016 04:45:00 +0000 (13:45 +0900)

Trivial merge