repo sync 60a4cd5e34 resolved conflicts for merge of abb08550 to master		2009-06-30 11:09:06 +08:00
..
acc	Add support for #pragma foo(bar)	2009-06-04 16:38:35 -07:00
android	Expose the stable/frozen log-related definitions of <cutils/logd.h> into a new header: <android/log.h>	2009-05-29 14:45:04 +02:00
arch	auto import from //depot/cupcake/@135843	2009-03-03 19:32:55 -08:00
ctest	auto import from //depot/cupcake/@135843	2009-03-03 19:32:55 -08:00
cutils	am 3f627205: Merge change 2875 into donut	2009-06-02 05:30:08 -07:00
mincrypt	auto import from //depot/cupcake/@135843	2009-03-03 19:32:55 -08:00
pixelflinger	auto import from //depot/cupcake/@135843	2009-03-03 19:32:55 -08:00
private	resolved conflicts for merge of abb08550 to master	2009-06-30 11:09:06 +08:00
sysutils	libsysutils: Move to a null terminated string protocol using space as a field separator.	2009-06-15 14:06:03 -07:00
zipfile	auto import from //depot/cupcake/@135843	2009-03-03 19:32:55 -08:00