Jeff Brown 9897b46138 resolved conflicts for merge of 2d280f75 to ics-mr1 ... Change-Id: I459e1cb0b60fb94dfb12862fedb9f8d949c226a7		2011-10-30 14:24:02 -07:00
..
binder	resolved conflicts for merge of 2d280f75 to ics-mr1	2011-10-30 14:24:02 -07:00
gui	Merge "SurfaceTexture: add tests for buffer leaks"	2011-10-20 09:09:31 -07:00
surfaceflinger_client
ui
utils	add -ldl to host executables	2011-10-20 16:21:25 -07:00