Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure
authoramiraj <amiraj.95@uci.edu>
Mon, 5 Aug 2019 19:28:05 +0000 (12:28 -0700)
committeramiraj <amiraj.95@uci.edu>
Mon, 5 Aug 2019 19:28:05 +0000 (12:28 -0700)

Trivial merge