projects / platform / upstream / iotivity.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d1604c 803bbef)
Merge branch 'master' into windows-port
authorDavid Antler <david.a.antler@intel.com>
Mon, 11 Apr 2016 16:56:24 +0000 (09:56 -0700)
committerDavid Antler <david.a.antler@intel.com>
Mon, 11 Apr 2016 16:57:29 +0000 (09:57 -0700)
Change-Id: Ibfd772068f8244192fced9276cadf0a7d56d52bc
Signed-off-by: David Antler <david.a.antler@intel.com>

Trivial merge
Domain: Network & Connectivity / IoT Connectivity;