Merge remote-tracking branch 'origin/routing-manager'
[platform/upstream/iotivity.git] / android / android_api / base / jni / JniOnPlatformInfoListener.cpp
2015-09-17 Sachin AgrawalMerge branch 'security-summit' into 'master'
2015-09-16 Patrick LankswertMerge "Merge easysetup branch into master"
2015-09-16 Tim KourtAndroid: Removing cancelObserve in OcResource destr.
2015-08-27 Vinil JainMerge branch 'master' into easysetup & CBOR changes
2015-08-05 Sachin AgrawalMerge branch 'master' into 'security-basecamp'
2015-07-15 Sachin AgrawalMerge 'security-basecamp' branch into master with CBOR
2015-07-03 hunje.yeonMerge branch 'master' into resource-manipulation
2015-07-01 Rahul RahulAdded platform information to the android code, as...