Imported Upstream version 1.0.0

[platform/upstream/iotivity.git] / android / android_api / base / src / main / AndroidManifest.xml

diff --git a/android/android_api/base/src/main/AndroidManifest.xml b/android/android_api/base/src/main/AndroidManifest.xml
old mode 100755 (executable)
new mode 100644 (file)
index 183e674..61bc68e
--- a/android/android_api/base/src/main/AndroidManifest.xml
+++ b/android/android_api/base/src/main/AndroidManifest.xml
@@ -1,35 +1,35 @@
-<!--\r
-  ~ //******************************************************************\r
-  ~ //\r
-  ~ // Copyright 2015 Intel Corporation.\r
-  ~ //\r
-  ~ //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\r
-  ~ //\r
-  ~ // Licensed under the Apache License, Version 2.0 (the "License");\r
-  ~ // you may not use this file except in compliance with the License.\r
-  ~ // You may obtain a copy of the License at\r
-  ~ //\r
-  ~ //      http://www.apache.org/licenses/LICENSE-2.0\r
-  ~ //\r
-  ~ // Unless required by applicable law or agreed to in writing, software\r
-  ~ // distributed under the License is distributed on an "AS IS" BASIS,\r
-  ~ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-  ~ // See the License for the specific language governing permissions and\r
-  ~ // limitations under the License.\r
-  ~ //\r
-  ~ //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\r
-  -->\r
-\r
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"\r
-    package="org.iotivity.base">\r
-    <uses-permission android:name="android.permission.BLUETOOTH" />\r
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />\r
-    <uses-permission android:name="android.permission.INTERNET" />\r
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />\r
-    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />\r
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />\r
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />\r
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />\r
-\r
-    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21" />\r
-</manifest>\r
+<!--
+  ~ //******************************************************************
+  ~ //
+  ~ // Copyright 2015 Intel Corporation.
+  ~ //
+  ~ //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+  ~ //
+  ~ // Licensed under the Apache License, Version 2.0 (the "License");
+  ~ // you may not use this file except in compliance with the License.
+  ~ // You may obtain a copy of the License at
+  ~ //
+  ~ //      http://www.apache.org/licenses/LICENSE-2.0
+  ~ //
+  ~ // Unless required by applicable law or agreed to in writing, software
+  ~ // distributed under the License is distributed on an "AS IS" BASIS,
+  ~ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ // See the License for the specific language governing permissions and
+  ~ // limitations under the License.
+  ~ //
+  ~ //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.iotivity.base">
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+
+    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21" />
+</manifest>