4bb6b751fbbb218e8a298db4aa008472a0aa8d31 - platform/frameworks/base

commit	4bb6b751fbbb218e8a298db4aa008472a0aa8d31	[log] [tgz]
author	Dianne Hackborn <hackbod@google.com>	Fri May 22 16:34:44 2015 -0700
committer	Dianne Hackborn <hackbod@google.com>	Fri May 22 16:34:44 2015 -0700
tree	ba7bccf0a758da93655db357c6fe5a8f60f8e90b
parent	4cb03fa059d0145e81e624fddc4b57cb471bd786 [diff]

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

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

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

18 files changed

tree: ba7bccf0a758da93655db357c6fe5a8f60f8e90b