Merge branch 'tizen_3.0' into tizen submit/tizen/20150731.103519
authorHyunjin Park <hj.na.park@samsung.com>
Mon, 3 Aug 2015 04:48:42 +0000 (13:48 +0900)
committerHyunjin Park <hj.na.park@samsung.com>
Mon, 3 Aug 2015 04:48:42 +0000 (13:48 +0900)

Trivial merge