Mathias Agopian c479e18db0 resolved conflicts for merge of 48a86240 to master ... Change-Id: I2305fef9f4dd46183337217d822df3c675b6b6e5		2010-09-15 12:29:18 -07:00
..
tests
Android.mk
ISurface.cpp
ISurfaceComposer.cpp
ISurfaceComposerClient.cpp
LayerState.cpp
SharedBufferStack.cpp	am d322d163: am ae66946b: Merge "fix a race in SF buffer management" into gingerbread	2010-08-27 16:18:12 -07:00
Surface.cpp	resolved conflicts for merge of 48a86240 to master	2010-09-15 12:29:18 -07:00
SurfaceComposerClient.cpp