projects
/
platform
/
upstream
/
iotivity.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
752db8a
60c7a3b
)
Merge branch 'master' into 'security-CKM' branch
author
Sachin Agrawal
<sachin.agrawal@intel.com>
Mon, 31 Aug 2015 23:37:38 +0000
(16:37 -0700)
committer
Sachin Agrawal
<sachin.agrawal@intel.com>
Mon, 31 Aug 2015 23:37:38 +0000
(16:37 -0700)
Change-Id: Ia1d47de74e1f6c39595806c68196c1d38e4a5815
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Trivial merge