Merge branch 'master' of https://github.uci.edu/rtrimana/smart_home_traffic
authorrtrimana <rtrimana@uci.edu>
Fri, 3 Aug 2018 23:36:27 +0000 (16:36 -0700)
committerrtrimana <rtrimana@uci.edu>
Fri, 3 Aug 2018 23:36:27 +0000 (16:36 -0700)
commit789cf885cd0f1e8a6aff1680fd2bcd10f28997cd
treecebaaf363f61bc7ae3822d70da1286ea16859089
parent4ecb12e1455fba6dfc82e49d99735e515bd29d73
parent751c8761c7069d2ddb23866483c88cfd6fa47b28
Merge branch 'master' of https://github.uci.edu/rtrimana/smart_home_traffic
Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Main.java