Merge branch 'upstream' into tizen
[platform/upstream/iotivity.git] / android / examples / simpleserver / simpleserver.iml
2016-04-19 youngmanMerge branch 'upstream' into tizen 80/66480/4 accepted/tizen/common/20160422.171753 accepted/tizen/ivi/20160423.060536 accepted/tizen/mobile/20160423.055559 accepted/tizen/tv/20160423.060010 accepted/tizen/wearable/20160423.060300 submit/tizen/20160421.063352
2016-04-19 youngmanImported Upstream version 1.1.0 71/66471/1 upstream/1.1.0
2015-11-02 youngmanMerge commit 'Imported Upstream version 1.0.0' into... 71/50471/3
2015-10-28 youngmanImported Upstream version 1.0.0 67/50367/1 upstream/1.0.0
2015-07-03 Youngjae ShinImported Upstream version 0.9.1 upstream/0.9.1