Merge "Fix multiple definition of 'is_slider','highlighted_object_x' and 'highlighted... accepted/tizen/common/20160921.162858 accepted/tizen/mobile/20160922.042231 accepted/tizen/wearable/20160922.042041 submit/tizen/20160921.091905
authorShinwoo Kim <cinoo.kim@samsung.com>
Wed, 21 Sep 2016 05:28:01 +0000 (22:28 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Wed, 21 Sep 2016 05:28:01 +0000 (22:28 -0700)

Trivial merge