projects / platform / upstream / iotivity.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b58560a 8bbdd4b)
Merge branch 'master' into resource-manipulation
authorhunje.yeon <hunje.yeon@samsung.com>
Sun, 12 Jul 2015 03:35:30 +0000 (12:35 +0900)
committerhunje.yeon <hunje.yeon@samsung.com>
Sun, 12 Jul 2015 03:35:43 +0000 (12:35 +0900)
Apply the resece updates from 'master' branch into 'resource-manipulation' branch
This update includes the fix of current 'presence' issues.

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

Trivial merge
Domain: Network & Connectivity / IoT Connectivity;