Suchi Amalapurapu e1fae30e20 Merge commit '0781df94' into manualmerge ...

Conflicts:
	Android.mk
	api/current.xml

2009-06-17 18:24:44 -07:00

..

java

Merge commit '0781df94' into manualmerge

2009-06-17 18:24:44 -07:00

jni

am 270e87f7: Sensors: Use a native_handle for the data channel instead of a single file descriptor.

2009-05-23 10:36:58 -07:00