Jeff Hamilton ee3420bc12 resolved conflicts for merge of 65475f89 to honeycomb-plus-aosp ... Change-Id: I9f77e84d887dbe84bb94de0fdd369d8de24fbec3		2011-04-05 12:32:50 -05:00
..
android	Remove libjnigraphics. moved to frameworks/base/native	2010-02-04 15:32:07 -08:00
arch	am 733e4701: am fa5f2ad4: am bd8f4a85: Merge "Define O_BINARY for non-Windows platforms."	2011-03-02 11:38:35 -08:00
ctest	auto import from //depot/cupcake/@135843	2009-03-03 19:32:55 -08:00
cutils	Try to unmount writable filesystems when rebooting	2011-03-10 18:11:46 -08:00
diskconfig	system: libdiskconfig: Add libdiskconfig	2010-03-10 15:19:06 -08:00
mincrypt	eclair snapshot	2009-11-12 18:46:23 -08:00
netutils	Stop using netmask in the framework	2011-02-02 14:18:44 -08:00
pixelflinger	pixelflinger: Fix function naming typo: gglBitBlti	2010-08-10 02:56:47 +08:00
private	resolved conflicts for merge of 65475f89 to honeycomb-plus-aosp	2011-04-05 12:32:50 -05:00
sysutils	Fix potential race introduced in Icd7f5f03	2011-03-22 14:03:11 -07:00
usbhost	libusbhost: Save endpoint ID in usb_request struct	2011-02-14 08:05:40 -05:00
zipfile	auto import from //depot/cupcake/@135843	2009-03-03 19:32:55 -08:00