Merge branch 'master' of https://github.uci.edu/rtrimana/smart_home_traffic
authorrtrimana <rtrimana@uci.edu>
Thu, 23 Aug 2018 17:26:54 +0000 (10:26 -0700)
committerrtrimana <rtrimana@uci.edu>
Thu, 23 Aug 2018 17:26:54 +0000 (10:26 -0700)
commit374c6e9784d688bdbc68cab79ca2f53313095824
tree9938a305938cb0c5f7f3949db88c86a3da740334
parent6d39a43c1dd95bb2f2c9064b4a820bab4597972f
parent9dbae3199586a0da2205ecd943b21bf0bef8b3e0
Merge branch 'master' of https://github.uci.edu/rtrimana/smart_home_traffic
Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Main.java