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

Trivial merge