Dianne Hackborn e2c7715c77 resolved conflicts for merge of bbca8133 to master ...

Change-Id: I81493674dceab848e41d380a77a37e5a9be06db6

2011-05-24 11:27:11 -07:00

..

asset_manager_jni.h

…

asset_manager.h

…

bitmap.h

…

configuration.h

Add "television" mode.

2011-05-23 15:11:08 -07:00

input.h

Add initial API for stylus and mouse buttons.

2011-05-13 12:11:17 -07:00

keycodes.h

Add 3D mode key and others.

2011-03-16 11:31:42 -07:00

looper.h

Fade out the mouse pointer after inactivity or other events.

2011-03-02 15:37:57 -08:00

native_activity.h

…

native_window_jni.h

Bug 3515073 Add ANativeWindow_fromSurfaceTexture

2011-03-04 16:39:29 -08:00

native_window.h

ANativeWindow_setBuffersGeometry now returns proper error codes

2011-03-31 20:59:58 -07:00

obb.h

…

rect.h

…

sensor.h

…

storage_manager.h

…

window.h

…