projects
/
platform
/
upstream
/
iotivity.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8180af2
016b007
)
Merge branch 'master' into extended-easysetup
author
Jihun Ha
<jihun.ha@samsung.com>
Thu, 28 Jul 2016 00:43:37 +0000
(09:43 +0900)
committer
Jihun Ha
<jihun.ha@samsung.com>
Thu, 28 Jul 2016 00:43:37 +0000
(09:43 +0900)
Change-Id: I5853e24accda1b7652a671949c466f920e5b8a82
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Trivial merge