From: George Nash <george.nash@intel.com>
Date: Mon, 12 Dec 2016 20:44:38 +0000 (-0800)
Subject: [IOT-1089] Merge remote-tracking branch 'origin/generic-java'
X-Git-Tag: 1.3.0~1048
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c30b6d0ca08ef40121732b6a6876b00cd34719ca;p=platform%2Fupstream%2Fiotivity.git

[IOT-1089] Merge remote-tracking branch 'origin/generic-java'

Change-Id: Icad0fdf58b85b23fa1d47a900bfd81b278592749
Signed-off-by: George Nash <george.nash@intel.com>
---

c30b6d0ca08ef40121732b6a6876b00cd34719ca