Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53ffd59e authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Merge tag 'android-4.4.1_r1' into HEAD 

Android 4.4.1 Release 1

Conflicts:
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/SecuritySettings.java
	src/com/android/settings/Settings.java

Change-Id: Id7de234388ba9e9b4223ddab900a335424207b2f
parents d4340974 9d91d19d

AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -1446,7 +1446,6 @@ 
        </activity>



        <activity android:name="Settings$WifiDisplaySettingsActivity"

                android:uiOptions="splitActionBarWhenNarrow"

                android:label="@string/wifi_display_settings_title"

                android:taskAffinity=""

                android:excludeFromRecents="true">

res/drawable-hdpi/appwidget_settings_ind_on_c_holo.9.png

−18 B (166 B)
Loading image diff...

res/drawable-hdpi/appwidget_settings_ind_on_l_holo.9.png

−28 B (215 B)
Loading image diff...

res/drawable-hdpi/appwidget_settings_ind_on_r_holo.9.png

−30 B (209 B)
Loading image diff...

res/drawable-hdpi/ic_appwidget_settings_bluetooth_off_holo.png

+470 B (1.44 KiB)
Loading image diff...