Merge branch 'master' into tizen_3.0
authorWoochan Lee <wc0917.lee@samsung.com>
Tue, 13 Dec 2016 09:56:02 +0000 (18:56 +0900)
committerWoochan Lee <wc0917.lee@samsung.com>
Tue, 13 Dec 2016 09:56:02 +0000 (18:56 +0900)

Trivial merge