Kenny Root 81bc567745 resolved conflicts for merge of 18490fb9 to master ... Change-Id: I6c68e6fb0f9c1182a955689bbffc161a8f30bd37		2011-04-12 12:51:08 -07:00
..
binder	Binder linkage no longer depends on JNI objrefs as persistent tokens	2011-02-28 11:37:20 -08:00
gui	SurfaceTexture can now force the client to request a buffer	2011-04-01 14:43:35 -07:00
pim
private	Add support for up to 32 buffers per Surface	2011-03-01 14:09:06 -08:00
surfaceflinger	remove more unused references to ISurface	2011-04-05 20:11:55 -07:00
tts
ui	Merge "Add a little input event consistency verifier."	2011-04-01 12:56:35 -07:00
utils	resolved conflicts for merge of 18490fb9 to master	2011-04-12 12:51:08 -07:00