Merge remote-tracking branch 'origin/master' into generic-java
[iotivity.git] / java / examples-android / simpleclient / src / main / assets / oic_svr_db_client.json
2016-11-28 George NashMerge remote-tracking branch 'origin/master' into gener... 65/14865/1
2016-11-18 George Nash[IOT-1089] Merge remote-tracking branch 'origin/master... 23/14523/2
2016-11-11 George Nash[IOT-1089] Merge remote-tracking branch 'origin/master... 31/14231/2
2016-11-08 George Nash[IOT-1089] Merge remote-tracking branch 'origin/master... 31/13531/3
2016-11-07 George Nash[IOT-1089]Merge remote-tracking branch 'origin/master... 15/12915/21
2016-10-24 Petre Eftime[IOT-1089] Change Android build system to accomodate... 95/7895/12