Kenny Root f6bbefd581 resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aosp ... Change-Id: Ia1a0024aabf531438203eb9fea3a10dd15eabe53		2011-04-12 10:27:15 -07:00
..
binder	Binder linkage no longer depends on JNI objrefs as persistent tokens	2011-02-28 11:37:20 -08:00
gui	Updated JBQ's original SurfaceTexture stubs to make webkit MR1 buildable	2011-03-31 17:40:08 -07:00
pim
private	Add support for up to 32 buffers per Surface	2011-03-01 14:09:06 -08:00
surfaceflinger	ANativeWindow: add queues-to-window-composer check.	2011-03-08 16:49:51 -08:00
tts	Update TTS plugin interface to receive engine configuration data	2010-03-18 11:52:41 -07:00
ui	ANativeWindow: add query for the concrete type.	2011-03-14 17:47:11 -07:00
utils	resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aosp	2011-04-12 10:27:15 -07:00