projects
/
platform
/
upstream
/
iotivity.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7ae4722
40a94b8
)
Merge branch 'master' into simulator
author
Harish Kumara Marappa
<h.marappa@samsung.com>
Fri, 13 Nov 2015 07:16:35 +0000
(12:46 +0530)
committer
Harish Kumara Marappa
<h.marappa@samsung.com>
Fri, 13 Nov 2015 07:16:35 +0000
(12:46 +0530)
Change-Id: I562e5df3bab28694b1841f5302b677ccdae7bbc6
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Trivial merge