git.osdn.net Git - android-x86/frameworks-base.git/commit

author	Dianne Hackborn <hackbod@google.com>
	Fri, 22 May 2015 23:34:44 +0000 (16:34 -0700)
committer	Dianne Hackborn <hackbod@google.com>
	Fri, 22 May 2015 23:34:44 +0000 (16:34 -0700)
commit	4bb6b751fbbb218e8a298db4aa008472a0aa8d31
tree	ba7bccf0a758da93655db357c6fe5a8f60f8e90b	tree \| snapshot
parent	4cb03fa059d0145e81e624fddc4b57cb471bd786	commit \| diff

Revert "resolved conflicts for merge of 47249f2a to mnc-dev"

This reverts commit c7becb7ee78881646251ff4846e63eb6b96bf7ec, reversing
changes made to 8562b08f04c1309cf40db1e749d612b6824f1d12.

18 files changed:

core/java/android/service/wallpaper/WallpaperService.java		diff \| blob \| history
core/java/android/view/IWindow.aidl		diff \| blob \| history
core/java/android/view/IWindowSession.aidl		diff \| blob \| history
core/java/android/view/SurfaceView.java		diff \| blob \| history
core/java/android/view/View.java		diff \| blob \| history
core/java/android/view/ViewRootImpl.java		diff \| blob \| history
core/java/android/view/WindowManagerPolicy.java		diff \| blob \| history
core/java/com/android/internal/os/SomeArgs.java		diff \| blob \| history
core/java/com/android/internal/policy/PhoneWindow.java		diff \| blob \| history
core/java/com/android/internal/util/ScreenShapeHelper.java		diff \| blob \| history
core/java/com/android/internal/view/BaseIWindow.java		diff \| blob \| history
core/res/res/values/config.xml		diff \| blob \| history
core/res/res/values/symbols.xml		diff \| blob \| history
services/core/java/com/android/server/policy/PhoneWindowManager.java		diff \| blob \| history
services/core/java/com/android/server/wm/Session.java		diff \| blob \| history
services/core/java/com/android/server/wm/WindowManagerService.java		diff \| blob \| history
services/core/java/com/android/server/wm/WindowState.java		diff \| blob \| history
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindow.java		diff \| blob \| history

frameworks/base

About OSDN

Find Software

Develop Software

Help