Merge branch 'tizen_3.0' into tizen
authorHyunjin Park <hj.na.park@samsung.com>
Wed, 2 Mar 2016 01:21:56 +0000 (10:21 +0900)
committerHyunjin Park <hj.na.park@samsung.com>
Wed, 2 Mar 2016 01:21:56 +0000 (10:21 +0900)

Trivial merge