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

Trivial merge
Domain: Network & Connectivity / IoT Connectivity;