Merge "Fix for StepParse - additional conditions checking for watch category in manif... accepted/tizen/common/20160920.131830 accepted/tizen/ivi/20160920.231559 accepted/tizen/mobile/20160920.231455 accepted/tizen/tv/20160920.231524 accepted/tizen/wearable/20160920.231541 submit/tizen/20160920.011443
authorwoongsuk cho <ws77.cho@samsung.com>
Mon, 19 Sep 2016 22:57:56 +0000 (15:57 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Mon, 19 Sep 2016 22:57:56 +0000 (15:57 -0700)

Trivial merge