projects
/
platform
/
upstream
/
iotivity.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d944861
1c9e619
)
Merge branch 'master' into extended-easysetup
author
uzchoi
<uzchoi@samsung.com>
Mon, 11 Jul 2016 02:54:47 +0000
(11:54 +0900)
committer
uzchoi
<uzchoi@samsung.com>
Mon, 11 Jul 2016 02:56:51 +0000
(11:56 +0900)
Change-Id: Ifad200718955d1f1382178e72c36866b538af622
1
2
service/easy-setup/enrollee/SConscript
patch
|
diff1
|
diff2
|
blob
|
history
service/easy-setup/mediator/richsdk/SConscript
patch
|
diff1
|
diff2
|
blob
|
history
service/easy-setup/mediator/richsdk/android/jni/Android.mk
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
service/easy-setup/enrollee/SConscript
Simple merge
diff --cc
service/easy-setup/mediator/richsdk/SConscript
Simple merge
diff --cc
service/easy-setup/mediator/richsdk/android/jni/Android.mk
Simple merge
projects / platform / upstream / iotivity.git / commitdiff