Merge branch 'tizen_3.0' into tizen
authorHyunjin Park <hj.na.park@samsung.com>
Thu, 21 Jan 2016 23:23:21 +0000 (08:23 +0900)
committerHyunjin Park <hj.na.park@samsung.com>
Thu, 21 Jan 2016 23:23:21 +0000 (08:23 +0900)

Trivial merge