projects
/
platform
/
upstream
/
iotivity.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
59cd3b9
357aaf9
)
Merge branch 'master' into 'security-summit' branch.
author
Sachin Agrawal
<sachin.agrawal@intel.com>
Wed, 2 Sep 2015 18:50:42 +0000
(11:50 -0700)
committer
Sachin Agrawal
<sachin.agrawal@intel.com>
Wed, 2 Sep 2015 18:50:42 +0000
(11:50 -0700)
Change-Id: Icea82717102b17826bed7fd42f29aad64534ef72
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Trivial merge