X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=android%2Fandroid_api%2Fbase%2Fsrc%2Fmain%2FAndroidManifest.xml;h=61bc68e1f0d890749636b72b4731e88a08262f90;hb=17c68b2fd1e74586f85e552eeab4e32dc121f8a0;hp=183e674d63c9e3872d24c32133ee7362df5952a7;hpb=8c01dff2c5bc5496f7dc1632c498943ec6ecb015;p=platform%2Fupstream%2Fiotivity.git

diff --git a/android/android_api/base/src/main/AndroidManifest.xml b/android/android_api/base/src/main/AndroidManifest.xml
old mode 100755
new mode 100644
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 @@
-<!--
-  ~ //******************************************************************
-  ~ //
-  ~ // 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>
+<!--
+  ~ //******************************************************************
+  ~ //
+  ~ // 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>