Merge tag 'android-4.4.1_r1' into HEAD
Android 4.4.1 Release 1 Conflicts: core/java/android/os/FileUtils.java core/jni/android_os_FileUtils.cpp packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java packages/Keyguard/src/com/android/keyguard/KeyguardTransportControlView.java packages/SystemUI/AndroidManifest.xml packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarTransitions.java packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java policy/src/com/android/internal/policy/impl/PhoneWindow.java services/java/com/android/server/SystemServer.java services/java/com/android/server/am/ActivityManagerService.java services/java/com/android/server/am/ActivityStack.java services/java/com/android/server/display/WifiDisplayController.java services/java/com/android/server/power/DisplayPowerController.java tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderAction.java tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java Change-Id: Ia0ea4b79b412bd0cdbbe620971915af88c6791c7
Loading
Please register or sign in to comment