Merge remote-tracking branch 'origin/master' into generic-java
[iotivity.git] / java / examples-android / simpleserver / src / main / assets / oic_svr_db_server.dat