Mathias Agopian 723ec00af4 Merge commit 'goog/master' into merge_master ... Conflicts: include/ui/Rect.h libs/ui/ISurfaceComposer.cpp		2009-05-27 14:34:50 -07:00
..
binder	Merge commit 'goog/master' into merge_master	2009-05-27 14:34:50 -07:00
pim	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
private	merge master to master_gl	2009-05-22 02:16:08 -07:00
tts	Add header declaring the interface for TTS engines to implement.	2009-05-21 15:32:11 -07:00
ui	Merge commit 'goog/master' into merge_master	2009-05-27 14:34:50 -07:00
utils	Merge commit 'goog/master' into merge_master	2009-05-27 14:34:50 -07:00
utils.h	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00