Scott Main da0a56df96 resolved conflicts for merge of e0408aa1 to eclair

2009-09-10 18:08:37 -07:00

..

Camera.java

resolved conflicts for merge of e0408aa1 to eclair

2009-09-10 18:08:37 -07:00

GeomagneticField.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ISensorService.aidl

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

2009-05-23 13:22:08 -04:00

package.html

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

Sensor.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

SensorEvent.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

SensorEventListener.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

SensorListener.java

I am getting tired of the java doc warnings, so fix them.

2009-08-24 17:37:32 -07:00

SensorManager.java

I am getting tired of the java doc warnings, so fix them.

2009-08-24 17:37:32 -07:00