Merge branch 'master' into tizen accepted/tizen/common/20160308.143712 accepted/tizen/ivi/20160309.010105 accepted/tizen/mobile/20160309.010014 accepted/tizen/tv/20160309.010030 accepted/tizen/wearable/20160309.010049 submit/tizen/20160308.104428
authorHyunjin Park <hj.na.park@samsung.com>
Tue, 8 Mar 2016 10:37:16 +0000 (19:37 +0900)
committerHyunjin Park <hj.na.park@samsung.com>
Tue, 8 Mar 2016 10:37:16 +0000 (19:37 +0900)

Trivial merge