From: rtrimana <rtrimana@uci.edu>
Date: Thu, 8 Aug 2019 19:52:56 +0000 (-0700)
Subject: Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8e05ecd8d97bab91e6ed971b172d1fa3d6b4f9fe;hp=-c;p=smartthings-infrastructure.git

Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure
---

8e05ecd8d97bab91e6ed971b172d1fa3d6b4f9fe