Merging changes.
authorrtrimana <rtrimana@uci.edu>
Wed, 28 Nov 2018 16:14:54 +0000 (08:14 -0800)
committerrtrimana <rtrimana@uci.edu>
Wed, 28 Nov 2018 16:14:54 +0000 (08:14 -0800)
commitef09fd85e67b9b79999f17078bc2442a87170ac3
tree8d5ce29c7acb8536e59c72b0dbac1d1a936cd471
parenta26c895f4a5e4779f1e1bc4951e8837d5f2de332
Merging changes.
Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/detection/SignatureDetector.java