From: Madan Lanka Date: Wed, 3 Jun 2015 05:16:02 +0000 (-0400) Subject: Merge branch 'master' into easysetup X-Git-Tag: 1.0.0-RC1^2~27^2~22 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2915615396fd9bb7f39b9d03d817e0376a8c7ffc;p=contrib%2Fiotivity.git Merge branch 'master' into easysetup Merging latest files from master branch to easysetup branch Change-Id: I5443a2361f749868a88ec0e37c6e20d337209ed6 Signed-off-by: Madan Lanka --- 2915615396fd9bb7f39b9d03d817e0376a8c7ffc