Merge branch 'tizen_3.0' into tizen accepted/tizen/common/20160302.193529 submit/tizen/20160302.021255
authorHyunjin Park <hj.na.park@samsung.com>
Wed, 2 Mar 2016 01:43:01 +0000 (10:43 +0900)
committerHyunjin Park <hj.na.park@samsung.com>
Wed, 2 Mar 2016 01:43:01 +0000 (10:43 +0900)

Trivial merge