projects / platform / upstream / iotivity.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 81b879f 56ae5f0)
Merge branch 'master' into resource-manipulation
authorhunje.yeon <hunje.yeon@samsung.com>
Thu, 11 Jun 2015 14:32:00 +0000 (23:32 +0900)
committerhunje.yeon <hunje.yeon@samsung.com>
Thu, 11 Jun 2015 15:16:13 +0000 (00:16 +0900)
update latest changes of master branch to resource-manipulation branch

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

Trivial merge
Domain: Network & Connectivity / IoT Connectivity;