Merge branch 'master' of https://github.uci.edu/rtrimana/smart_home_traffic
authorrtrimana <rtrimana@uci.edu>
Mon, 20 Aug 2018 18:59:43 +0000 (11:59 -0700)
committerrtrimana <rtrimana@uci.edu>
Mon, 20 Aug 2018 18:59:43 +0000 (11:59 -0700)
commitb43149a6c6459c21ac1b5a5d243099f9d96b1a95
tree7d18c317c9ebb70b5442a5f5a65a1ad674ed412f
parent642ff2b5efd69fa039b567cec4affc93a3dca565
parentdec8f35fb1a1be32cf0302a7a23194e8dbe09a7a
Merge branch 'master' of https://github.uci.edu/rtrimana/smart_home_traffic
Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Main.java