projects / platform / upstream / iotivity.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b4b7d87 f9d7b50)
Merge branch 'master' into 'security-CKM' branch.
authorSachin Agrawal <sachin.agrawal@intel.com>
Mon, 3 Aug 2015 19:15:55 +0000 (12:15 -0700)
committerSachin Agrawal <sachin.agrawal@intel.com>
Mon, 3 Aug 2015 20:36:51 +0000 (20:36 +0000)
Change-Id: Ic077fb82ebeac6fa50777a083e878c205139b586
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>

Trivial merge
Domain: Network & Connectivity / IoT Connectivity;