Dianne Hackborn db05e228a4 resolved conflicts for merge of 05be6d6f to master ... Change-Id: Ic6a6c5bb300f6f1d43f9ed550b284282b4f16212		2011-05-09 19:00:59 -07:00
..
egl	frameworks/base: move ANativeWindow/android_native_buffer_t out	2011-05-03 16:39:54 -07:00
android_native_buffer.h	frameworks/base: move ANativeWindow/android_native_buffer_t out	2011-05-03 16:39:54 -07:00
DisplayInfo.h	Mouse pointer integration.	2011-01-04 17:31:24 -08:00
EGLNativeSurface.h
EGLUtils.h
FramebufferNativeWindow.h	frameworks/base: android_native_buffer_t -> ANativeWindowBuffer	2011-05-03 16:40:14 -07:00
GraphicBuffer.h	frameworks/base: android_native_buffer_t -> ANativeWindowBuffer	2011-05-03 16:40:14 -07:00
GraphicBufferAllocator.h	[3171580] don't automatically log GraphicBuffer allocation failures	2010-12-03 17:33:09 -08:00
GraphicBufferMapper.h
GraphicLog.h
Input.h	resolved conflicts for merge of 05be6d6f to master	2011-05-09 19:00:59 -07:00
InputTransport.h	Add support for fallback keycodes.	2010-12-07 17:35:26 -08:00
Keyboard.h	Fade out the mouse pointer after inactivity or other events.	2011-03-02 15:37:57 -08:00
KeyCharacterMap.h	Add support for fallback keycodes.	2010-12-07 17:35:26 -08:00
KeycodeLabels.h	Add 3D mode key and others.	2011-03-16 11:31:42 -07:00
KeyLayoutMap.h	Joystick tweaks. (DO NOT MERGE)	2011-03-04 19:12:41 -08:00
PixelFormat.h
Point.h
PowerManager.h
Rect.h
Region.h	get rid of dependency on copybit HAL module	2011-04-28 19:50:21 -07:00
VirtualKeyMap.h	Improve support for external keyboards.	2010-12-02 16:01:32 -08:00