Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure
authorrtrimana <rtrimana@uci.edu>
Tue, 6 Aug 2019 23:11:38 +0000 (16:11 -0700)
committerrtrimana <rtrimana@uci.edu>
Tue, 6 Aug 2019 23:11:38 +0000 (16:11 -0700)

Trivial merge