Jeff Brown b380c4d7ed resolved conflicts for merge of a05088c1 to master ...

Change-Id: I7973f9f28586dec9b9659f8f662f40db7997a521

2010-09-08 13:02:55 -07:00

..

asset_manager_jni.h

More native work.

2010-08-11 00:29:59 -07:00

asset_manager.h

More native work.

2010-08-11 00:29:59 -07:00

bitmap.h

…

configuration.h

More native work.

2010-08-11 00:29:59 -07:00

input.h

Add support for secure views.

2010-09-08 11:50:55 -07:00

keycodes.h

Add initial gamepad support.

2010-07-13 17:04:57 -07:00

looper.h

Modify native ALooper to take an explicit ident.

2010-09-07 15:46:55 -07:00

native_activity.h

More native work.

2010-08-11 00:29:59 -07:00

native_window_jni.h

Add ANativeWindow API for directly drawing to the surface bits.

2010-07-09 16:58:19 -07:00

native_window.h

More native work.

2010-08-11 00:29:59 -07:00

rect.h

Add ANativeWindow API for directly drawing to the surface bits.

2010-07-09 16:58:19 -07:00

sensor.h

Modify native ALooper to take an explicit ident.

2010-09-07 15:46:55 -07:00

storage_manager.h

Add AStorageManager API to NDK

2010-08-20 13:27:31 -07:00

tts.h

Adding the old legacy method for getTtsEngine for Froyo compatibility.

2010-07-14 15:21:56 -07:00

window.h

Add ANativeWindow API for directly drawing to the surface bits.

2010-07-09 16:58:19 -07:00