projects
/
platform
/
upstream
/
iotivity.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d3e1942
e9f0dae
)
Merge branch 'master' into iot-1785
author
Kevin Kane
<kkane@microsoft.com>
Tue, 14 Feb 2017 17:37:49 +0000
(09:37 -0800)
committer
Kevin Kane
<kkane@microsoft.com>
Tue, 14 Feb 2017 17:37:54 +0000
(09:37 -0800)
Change-Id: Ibbf0c86bc2c54e1ee283761b2131a301485bffff
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Trivial merge