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

author	Jeff Brown <jeffbrown@google.com>
	Fri, 11 Apr 2014 08:21:14 +0000 (01:21 -0700)
committer	Jeff Brown <jeffbrown@google.com>
	Fri, 11 Apr 2014 08:33:20 +0000 (01:33 -0700)
commit	4e5c089ef3e62e7f658e71c0be262d09bd3e399b
tree	6482287ee4ff25d4f40d8e2fd162c85c2dbbc14e	tree \| snapshot
parent	90b39abaf95640021d15be70b5841abe8366b33e	commit \| diff
parent	337e764debde56b1462fb5f2794b3e917d8a42e2	commit \| diff

resolved conflicts for merge of 337e764d to master

Change-Id: I8168dbf42b68c2f7b5ccb300e0080dddc627af26

api/current.txt	diff1 \|	diff2 \|	blob \| history
core/java/android/content/Intent.java	diff1 \|	diff2 \|	blob \| history
core/java/android/os/IPowerManager.aidl	diff1 \|	diff2 \|	blob \| history
core/java/android/os/PowerManager.java	diff1 \|	diff2 \|	blob \| history
core/java/android/view/Display.java	diff1 \|	diff2 \|	blob \| history
core/java/android/view/DisplayInfo.java	diff1 \|	diff2 \|	blob \| history
core/java/android/view/KeyEvent.java	diff1 \|	diff2 \|	blob \| history
core/java/android/view/WindowManagerPolicy.java	diff1 \|	diff2 \|	blob \| history
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/display/DisplayPowerController.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/display/LocalDisplayAdapter.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/display/LogicalDisplay.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/input/InputManagerService.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/power/Notifier.java	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/power/PowerManagerService.java	diff1 \|	diff2 \|	blob \| history
services/core/jni/com_android_server_input_InputManagerService.cpp	diff1 \|	diff2 \|	blob \| history
services/core/jni/com_android_server_power_PowerManagerService.cpp	diff1 \|	diff2 \|	blob \| history
services/core/jni/com_android_server_power_PowerManagerService.h	diff1 \|	diff2 \|	blob \| history