Nick Pelly 96f1959dfe am fc00b2ed: am 1bce9e25: am 01588aca: Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread ... * commit 'fc00b2ed4fa64621015b47310b91e937581bd3a3': Preserve invariant that sService is not null (although NfcAdapter.get() can return null)		2011-07-15 11:20:44 -07:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Merge changes Id9aa1003,I8c154189	2011-07-14 17:54:27 -07:00
libs	Merge "Add a call to pthread_attr_destroy to avoid potential memory leaks."	2011-07-14 22:31:27 -07:00
opengl	Merge "Remove the simulator target from all makefiles. Bug: 5010576"	2011-07-12 12:15:07 -07:00
services/surfaceflinger	take the state transform into account with h/w composer hal	2011-07-12 14:51:45 -07:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00