Merge "Fix build error, demo launching issues." accepted/tizen/common/20160621.184430 accepted/tizen/mobile/20160622.093756 submit/tizen/20160621.052046
authorWoochan Lee <wc0917.lee@samsung.com>
Tue, 21 Jun 2016 05:18:42 +0000 (22:18 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 21 Jun 2016 05:18:42 +0000 (22:18 -0700)

Trivial merge