Merge branch 'master' into tizen accepted/tizen/common/20160411.130950 accepted/tizen/ivi/20160412.010141 accepted/tizen/mobile/20160412.010134 accepted/tizen/tv/20160412.010028 accepted/tizen/wearable/20160412.010043 submit/tizen/20160411.115901
authorHyunjin Park <hj.na.park@samsung.com>
Mon, 11 Apr 2016 11:29:26 +0000 (20:29 +0900)
committerHyunjin Park <hj.na.park@samsung.com>
Mon, 11 Apr 2016 11:29:26 +0000 (20:29 +0900)

Trivial merge