1.1 --- a/app/src/main/AndroidManifest.xml	Mon Apr 20 17:11:10 2015 +0300
     1.2 +++ b/app/src/main/AndroidManifest.xml	Thu Apr 23 10:53:54 2015 -0700
     1.3 @@ -1,18 +1,14 @@
     1.4  <?xml version="1.0" encoding="utf-8"?>
     1.5  <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     1.6 -    package="com.example.friendstream.friendstream" >
     1.7 +    package="com.example.musicplayer" >
     1.8  
     1.9 -    <!--allows music to play in the background, after Activity view switched out -->
    1.10 -    <uses-permission android:name="android.permission.WAKE_LOCK" />
    1.11 -
    1.12 -    <!--Generated by Android Studio -->
    1.13      <application
    1.14          android:allowBackup="true"
    1.15          android:icon="@mipmap/ic_launcher"
    1.16          android:label="@string/app_name"
    1.17          android:theme="@style/AppTheme" >
    1.18          <activity
    1.19 -            android:name=".PickingSongs"
    1.20 +            android:name=".MainActivity"
    1.21              android:configChanges="orientation|keyboardHidden|screenSize"
    1.22              android:label="@string/app_name"
    1.23              android:theme="@style/FullscreenTheme" >
    1.24 @@ -22,12 +18,6 @@
    1.25                  <category android:name="android.intent.category.LAUNCHER" />
    1.26              </intent-filter>
    1.27          </activity>
    1.28 -
    1.29 -        <service
    1.30 -            android:name=".MusicService"
    1.31 -            android:enabled="true"
    1.32 -            android:exported="true" >
    1.33 -        </service>
    1.34      </application>
    1.35  
    1.36  </manifest>