Kenny Root 53e75ea847 resolved conflicts for merge of 485de781 to master ...

Change-Id: I483cb81596f09b024b1aea7fc55960183f38b24f

2010-08-24 09:57:33 -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 stdint.h to fix sim-eng

2010-07-28 16:41:02 -07:00

keycodes.h

…

looper.h

…

native_activity.h

More native work.

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

native_window_jni.h

…

native_window.h

More native work.

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

rect.h

…

sensor.h

Added SensorManager.getMinDelay()

2010-07-29 18:18:00 -07:00

storage_manager.h

Add AStorageManager API to NDK

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

tts.h

…

window.h

…