Merge branch 'tizen_3.0' into tizen submit/tizen/20160202.072713
authorHyunjin Park <hj.na.park@samsung.com>
Tue, 2 Feb 2016 07:15:19 +0000 (16:15 +0900)
committerHyunjin Park <hj.na.park@samsung.com>
Tue, 2 Feb 2016 07:15:19 +0000 (16:15 +0900)

Trivial merge