Derek Sollenberger 33e86c7a91 resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp ... Change-Id: Iebde13c41a2adf4e693d87e808cb0659f913e4e6		2011-07-29 14:16:18 -04:00
..
tests
Android.mk
ISensorEventConnection.cpp
ISensorServer.cpp	new SensorService	2010-07-19 17:57:29 -07:00
ISurfaceTexture.cpp
Sensor.cpp
SensorChannel.cpp
SensorEventQueue.cpp
SensorManager.cpp	new SensorService	2010-07-19 17:57:29 -07:00
SurfaceTexture.cpp
SurfaceTextureClient.cpp	SurfaceTextureClient: Add ISurfaceTexture getter.	2011-03-14 17:47:11 -07:00