Merge branch 'master' of https://github.uci.edu/rtrimana/smart_home_traffic
authorrtrimana <rtrimana@uci.edu>
Sat, 1 Sep 2018 00:00:38 +0000 (17:00 -0700)
committerrtrimana <rtrimana@uci.edu>
Sat, 1 Sep 2018 00:00:38 +0000 (17:00 -0700)
commit43c995b9338313fc4dd01788213b2d188a8901a3
tree234b70d83011fd208a3e501ac716835bb64556c6
parent301f34fb861dd5622d96bbbfe07bcd82b120fabf
parent0605d57536ed620ef22431715a157f37d2865d93
Merge branch 'master' of https://github.uci.edu/rtrimana/smart_home_traffic
Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Main.java