Svetoslav Ganov f3b4f3163b resolved conflicts for merge of 26f7a81f to master ...

Change-Id: I6bf5fd7c0de7945cef84602dbe3a7bbed587700f

2011-11-30 18:34:56 -08:00

..

audioflinger

am f6422f5f: am 20398fac: Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1

2011-11-23 12:35:01 -08:00

camera

Add camera focus move callback.

2011-11-29 14:28:05 +08:00

input

am 4c0e0dd2: am 3e7497b4: Merge "Eliminate hw.keyboards system properties." into ics-mr1

2011-11-15 19:43:35 -08:00

java

resolved conflicts for merge of 26f7a81f to master

2011-11-30 18:34:56 -08:00

jni

split ComposerService out of SurfaceComposerClient.h

2011-11-28 15:21:57 -08:00

powermanager

…

sensorservice

am e1d50e0c: am 785fd368: Merge "handle EINTR when calling sensor HAL\'s poll function" into ics-mr1

2011-11-10 19:39:53 +00:00

surfaceflinger

am e2970700: am e8ba2aba: Merge "add a way to access the version string of the h/w implementation of EGL" into ics-mr1

2011-11-30 13:57:46 -08:00

tests/servicestests

Move NativeDaemonConnector to varargs.

2011-11-29 12:09:06 -08:00