From: Dan Timoney <dtimoney@att.com>
Date: Thu, 4 Jan 2018 12:29:41 +0000 (+0000)
Subject: Merge "Fixed as per Java Code Conventions"
X-Git-Tag: 1.0.4~7^2~172
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=d6c32fe37ae44925863d552a931b0a5bc4636a65;p=ccsdk%2Fsli.git

Merge "Fixed as per Java Code Conventions"
---

d6c32fe37ae44925863d552a931b0a5bc4636a65