Dianne Hackborn 8a7d44e824 resolved conflicts for merge of 54cb63e2 to master ...

Change-Id: I5b741a1781e3f76c03fc1534ffce871117effd10

2011-06-02 16:44:52 -07:00

..

asset_manager_jni.h

…

asset_manager.h

…

bitmap.h

…

configuration.h

Add "tv" density for 720p screens.

2011-05-27 13:40:26 -07:00

input.h

Add initial API for stylus and mouse buttons.

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

keycodes.h

…

looper.h

…

native_activity.h

…

native_window_jni.h

…

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

…