projects / platform / upstream / iotivity.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ae44f1 d4782e3)
Merge branch 'master' into resource-manipulation
authorhunje.yeon <hunje.yeon@samsung.com>
Fri, 10 Jul 2015 04:40:19 +0000 (13:40 +0900)
committerhunje.yeon <hunje.yeon@samsung.com>
Fri, 10 Jul 2015 04:40:26 +0000 (13:40 +0900)
Update the recent changes of 'master' branch into 'resource-manipulation' branch

Change-Id: I24c60962d6e6c6d2b80af0333bd5f011b5083f27
Signed-off-by: hunje.yeon <hunje.yeon@samsung.com>

Trivial merge
Domain: Network & Connectivity / IoT Connectivity;