Jeff Hamilton 18247d74be am ee3420bc: resolved conflicts for merge of 65475f89 to honeycomb-plus-aosp ... * commit 'ee3420bc124613827af474684c3015d12742c70d': Make the NFC UID forward compatible.		2011-04-05 10:42:19 -07:00
..
android	Remove libjnigraphics. moved to frameworks/base/native	2010-02-04 15:32:07 -08:00
arch	Revert "Define O_BINARY for non-Windows platforms."	2011-03-02 16:49:34 -08:00
ctest	auto import from //depot/cupcake/@135843	2009-03-03 19:32:55 -08:00
cutils	Add ifndef guards to remaining logging macros.	2011-03-29 16:24:45 -07: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