Derek Sollenberger 33e86c7a91 resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp ... Change-Id: Iebde13c41a2adf4e693d87e808cb0659f913e4e6		2011-07-29 14:16:18 -04:00
..
ISensorEventConnection.h
ISensorServer.h
ISurfaceTexture.h	Pass the IGraphicBufferAlloc to SurfaceTextureClient.	2011-02-02 15:31:47 -08:00
Sensor.h
SensorChannel.h
SensorEventQueue.h
SensorManager.h
SurfaceTexture.h	resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp	2011-07-29 14:16:18 -04:00
SurfaceTextureClient.h	SurfaceTextureClient: Add ISurfaceTexture getter.	2011-03-14 17:47:11 -07:00