projects / platform / upstream / iotivity.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a01c5d0 6f5426d)
Merge branch 'master' into windows-port
authorDavid Antler <david.a.antler@intel.com>
Mon, 25 Apr 2016 16:15:27 +0000 (09:15 -0700)
committerDavid Antler <david.a.antler@intel.com>
Mon, 25 Apr 2016 16:15:51 +0000 (09:15 -0700)
Change-Id: I7ad9210417b7cfa0eb99de1d8ce9a8c20fd459cd
Signed-off-by: David Antler <david.a.antler@intel.com>

Trivial merge
Domain: Network & Connectivity / IoT Connectivity;