Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure
authoramiraj <amiraj.95@uci.edu>
Mon, 5 Aug 2019 02:58:53 +0000 (19:58 -0700)
committeramiraj <amiraj.95@uci.edu>
Mon, 5 Aug 2019 02:58:53 +0000 (19:58 -0700)
1  2 
ColorControl/ColorControls.groovy

Simple merge