Dianne Hackborn 161e67ff3b resolved conflicts for merge of 06a8ceac to master ...

Change-Id: Id51574c825affddfac14ad7214c5496d6a3d6e69

2011-05-19 21:44:52 -07:00

..

Android.mk

merge libsurfaceflinger_client into libgui

2011-03-25 18:42:40 -07:00

asset_manager.cpp

Introduce NDK API for 64-bit assets

2010-12-13 12:02:19 -08:00

configuration.cpp

Add new "-swNNNdp" resource qualifier.

2011-05-19 18:23:29 -07:00

input.cpp

Add initial API for stylus and mouse buttons.

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

looper.cpp

Flush Binder commands in ndk looper.

2011-01-10 14:37:46 -08:00

native_activity.cpp

Fix issue #3117918: No way to finish a native activity

2010-10-21 19:07:37 -07:00

native_window.cpp

ANativeWindow_setBuffersGeometry now returns proper error codes

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

obb.cpp

…

sensor.cpp

…

storage_manager.cpp

…