Merge branch 'master', remote-tracking branch 'origin/tizen' into tizen accepted/tizen/common/20160325.135201 submit/tizen/20160324.015904
authorEunji, Lee <eunjieji.lee@samsung.com>
Thu, 24 Mar 2016 01:58:18 +0000 (10:58 +0900)
committerEunji, Lee <eunjieji.lee@samsung.com>
Thu, 24 Mar 2016 01:58:18 +0000 (10:58 +0900)

Trivial merge