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

Skip to content
Commit 62e01e4e authored by Manish Kumar's avatar Manish Kumar
Browse files

Merge tag 'android-4.4.3_r1' into merge_branch

Android 4.4.3 release 1

Conflicts:
	Android.mk
	core/res/res/drawable-hdpi/ic_media_route_disabled_holo_dark.png
	core/res/res/drawable-hdpi/ic_media_route_off_holo_dark.png
	core/res/res/drawable-hdpi/ic_media_route_off_holo_light.png
	core/res/res/drawable-hdpi/ic_media_route_on_0_holo_dark.png
	core/res/res/drawable-hdpi/ic_media_route_on_0_holo_light.png
	core/res/res/drawable-hdpi/ic_media_route_on_1_holo_dark.png
	core/res/res/drawable-hdpi/ic_media_route_on_1_holo_light.png
	core/res/res/drawable-hdpi/ic_media_route_on_2_holo_dark.png
	core/res/res/drawable-hdpi/ic_media_route_on_2_holo_light.png
	core/res/res/drawable-hdpi/ic_media_route_on_holo_dark.png
	core/res/res/drawable-hdpi/ic_media_route_on_holo_light.png
	core/res/res/drawable-mdpi/ic_media_route_off_holo_dark.png
	core/res/res/drawable-mdpi/ic_media_route_off_holo_light.png
	core/res/res/drawable-mdpi/ic_media_route_on_0_holo_dark.png
	core/res/res/drawable-mdpi/ic_media_route_on_0_holo_light.png
	core/res/res/drawable-mdpi/ic_media_route_on_1_holo_dark.png
	core/res/res/drawable-mdpi/ic_media_route_on_1_holo_light.png
	core/res/res/drawable-mdpi/ic_media_route_on_2_holo_dark.png
	core/res/res/drawable-mdpi/ic_media_route_on_2_holo_light.png
	core/res/res/drawable-mdpi/ic_media_route_on_holo_dark.png
	core/res/res/drawable-mdpi/ic_media_route_on_holo_light.png
	core/res/res/drawable-xhdpi/ic_media_route_disabled_holo_dark.png
	core/res/res/drawable-xhdpi/ic_media_route_disabled_holo_light.png
	core/res/res/drawable-xhdpi/ic_media_route_off_holo_dark.png
	core/res/res/drawable-xhdpi/ic_media_route_off_holo_light.png
	core/res/res/drawable-xhdpi/ic_media_route_on_0_holo_dark.png
	core/res/res/drawable-xhdpi/ic_media_route_on_0_holo_light.png
	core/res/res/drawable-xhdpi/ic_media_route_on_1_holo_dark.png
	core/res/res/drawable-xhdpi/ic_media_route_on_1_holo_light.png
	core/res/res/drawable-xhdpi/ic_media_route_on_2_holo_dark.png
	core/res/res/drawable-xhdpi/ic_media_route_on_2_holo_light.png
	core/res/res/drawable-xhdpi/ic_media_route_on_holo_dark.png
	core/res/res/drawable-xhdpi/ic_media_route_on_holo_light.png
	core/res/res/drawable-xxhdpi/ic_media_route_disabled_holo_dark.png
	core/res/res/drawable-xxhdpi/ic_media_route_disabled_holo_light.png
	core/res/res/drawable-xxhdpi/ic_media_route_off_holo_dark.png
	core/res/res/drawable-xxhdpi/ic_media_route_off_holo_light.png
	core/res/res/drawable-xxhdpi/ic_media_route_on_0_holo_dark.png
	core/res/res/drawable-xxhdpi/ic_media_route_on_0_holo_light.png
	core/res/res/drawable-xxhdpi/ic_media_route_on_1_holo_dark.png
	core/res/res/drawable-xxhdpi/ic_media_route_on_1_holo_light.png
	core/res/res/drawable-xxhdpi/ic_media_route_on_2_holo_dark.png
	core/res/res/drawable-xxhdpi/ic_media_route_on_2_holo_light.png
	core/res/res/drawable-xxhdpi/ic_media_route_on_holo_dark.png
	core/res/res/drawable-xxhdpi/ic_media_route_on_holo_light.png
	core/res/res/values/bools.xml
	core/res/res/values/config.xml
	core/res/res/values/symbols.xml
	packages/WallpaperCropper/src/com/android/wallpapercropper/WallpaperCropActivity.java
	services/java/com/android/server/BackupManagerService.java
	services/java/com/android/server/am/ActiveServices.java
	services/java/com/android/server/display/DisplayManagerService.java
	services/java/com/android/server/power/DisplayPowerController.java
	telephony/java/android/telephony/TelephonyManager.java
	telephony/java/com/android/internal/telephony/ITelephony.aidl

Change-Id: I48ac7a622b8641ac4090fd9d60053158766318b8
parents 98b0186e 76593e19
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment