projects / platform / upstream / iotivity.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eab619b 53f826d)
Merge branch 'master' into windows-port
authorDavid Antler <david.a.antler@intel.com>
Wed, 4 May 2016 16:57:46 +0000 (09:57 -0700)
committerDavid Antler <david.a.antler@intel.com>
Wed, 4 May 2016 16:58:18 +0000 (09:58 -0700)
Change-Id: Iefbd0b074e8e654ee143617137c165d05ab56aed
Signed-off-by: David Antler <david.a.antler@intel.com>

Trivial merge
Domain: Network & Connectivity / IoT Connectivity;