projects
/
platform
/
upstream
/
iotivity.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
193edab
7b553e0
)
[IOT-1089] Merge remote-tracking branch 'origin/generic-java'
author
George Nash
<george.nash@intel.com>
Mon, 12 Dec 2016 20:44:38 +0000
(12:44 -0800)
committer
George Nash
<george.nash@intel.com>
Mon, 12 Dec 2016 22:19:45 +0000
(14:19 -0800)
Change-Id: Icad0fdf58b85b23fa1d47a900bfd81b278592749
Signed-off-by: George Nash <george.nash@intel.com>
1
2
java/common/src/main/java/org/iotivity/base/OcAccountManager.java
patch
|
diff1
|
diff2
|
blob
|
history
java/examples-android/simplebase/src/main/java/org/iotivity/base/examples/CloudFragment.java
patch
|
diff1
|
diff2
|
blob
|
history
java/examples-android/simplebase/src/main/res/layout/fragment_cloud.xml
patch
|
diff1
|
diff2
|
blob
|
history
java/examples-android/simplebase/src/main/res/layout/input.xml
patch
|
diff1
|
diff2
|
blob
|
history
java/jni/JniOcAccountManager.cpp
patch
|
diff1
|
diff2
|
blob
|
history
java/jni/JniOcAccountManager.h
patch
|
diff1
|
diff2
|
blob
|
history
java/jni/JniUtils.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
java/common/src/main/java/org/iotivity/base/OcAccountManager.java
Simple merge
diff --cc
java/examples-android/simplebase/src/main/java/org/iotivity/base/examples/CloudFragment.java
Simple merge
diff --cc
java/examples-android/simplebase/src/main/res/layout/fragment_cloud.xml
Simple merge
diff --cc
java/examples-android/simplebase/src/main/res/layout/input.xml
Simple merge
diff --cc
java/jni/JniOcAccountManager.cpp
Simple merge
diff --cc
java/jni/JniOcAccountManager.h
Simple merge
diff --cc
java/jni/JniUtils.h
Simple merge