projects / platform / upstream / iotivity.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3390476 8aced63)
Merge branch 'master' into windows-port
authorDavid Antler <david.a.antler@intel.com>
Mon, 16 May 2016 16:22:19 +0000 (09:22 -0700)
committerDavid Antler <david.a.antler@intel.com>
Mon, 16 May 2016 16:22:40 +0000 (09:22 -0700)
Change-Id: I980ead11aa2b07bc3cf2d21a7baa5e207da4398c
Signed-off-by: David Antler <david.a.antler@intel.com>

Trivial merge
Domain: Network & Connectivity / IoT Connectivity;