Merge branch 'tizen_3.0' into tizen
authorHyunjin Park <hj.na.park@samsung.com>
Tue, 26 Jan 2016 10:05:39 +0000 (19:05 +0900)
committerHyunjin Park <hj.na.park@samsung.com>
Tue, 26 Jan 2016 10:05:39 +0000 (19:05 +0900)

Trivial merge