Merge "Removed redundant launcher icon reference." into jb-mr2-dev
This commit is contained in:
@@ -24,10 +24,7 @@
|
||||
<application android:label="@string/app_name"
|
||||
android:icon="@drawable/ic_launcher">
|
||||
|
||||
<activity android:name="CustomRestrictionsActivity"
|
||||
android:label="@string/restrictions_activity_label" />
|
||||
<activity android:name="MainActivity"
|
||||
android:icon="@drawable/ic_launcher"
|
||||
android:label="@string/app_name" >
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
@@ -35,6 +32,9 @@
|
||||
</intent-filter>
|
||||
</activity>
|
||||
|
||||
<activity android:name="CustomRestrictionsActivity"
|
||||
android:label="@string/restrictions_activity_label" />
|
||||
|
||||
<receiver android:name="GetRestrictionsReceiver">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.GET_RESTRICTION_ENTRIES" />
|
||||
|
||||
Reference in New Issue
Block a user