Merge branch 'master' into group-manager
[platform/upstream/iotivity.git] / android / android_api / .gitignore
2015-05-20 Ossama OthmanRemoved executable bit from non-executable files.
2015-05-15 Tim KourtAndroid Base API merge to master