Merge branch 'tizen_3.0' into tizen submit/tizen/20160429.041112
authorHyunjin Park <hj.na.park@samsung.com>
Fri, 29 Apr 2016 03:02:52 +0000 (12:02 +0900)
committerHyunjin Park <hj.na.park@samsung.com>
Fri, 29 Apr 2016 03:02:52 +0000 (12:02 +0900)

Trivial merge