From: rtrimana <rtrimana@uci.edu>
Date: Tue, 2 Aug 2016 16:17:22 +0000 (-0700)
Subject: Conflict in an if-statement - merging
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f37852239a8fa4261a7da81f7398417bf5338f9e;p=iotcloud.git

Conflict in an if-statement - merging
---

f37852239a8fa4261a7da81f7398417bf5338f9e