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

Commit 09ad099e authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Merge tag 'android-4.4.3_r1' into HEAD

Android 4.4.3 release 1

Conflicts:
	Android.mk
	core/java/android/app/ContextImpl.java
	core/java/android/app/WallpaperManager.java
	core/java/android/view/ViewConfiguration.java
	core/jni/android/graphics/Paint.cpp
	core/res/res/values-fr-rCA/strings.xml
	core/res/res/values-ru/strings.xml
	core/res/res/values/config.xml
	core/res/res/values/symbols.xml
	packages/WallpaperCropper/src/com/android/wallpapercropper/WallpaperCropActivity.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	services/java/com/android/server/BackupManagerService.java
	services/java/com/android/server/ConnectivityService.java
	services/java/com/android/server/am/ActiveServices.java
	services/java/com/android/server/display/WifiDisplayController.java
	services/java/com/android/server/pm/PackageManagerService.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: Ib3f2a28b2a0ea869a541fe1cb25fd97281673839
parents 03224011 76593e19
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment