Nick Pelly 85ec70a41a Merge "Throw a nicer error message when using an invalid context to create Nfc"		2011-11-21 17:31:45 -08:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	am d0df44b5: am 4d71053b: Merge "attempt to fix bug 5313580" into ics-mr1	2011-11-18 15:22:59 -08:00
libs	am d0df44b5: am 4d71053b: Merge "attempt to fix bug 5313580" into ics-mr1	2011-11-18 15:22:59 -08:00
opengl	Merge "EGL: fix blob cache extension detection" into ics-mr1	2011-11-17 17:10:32 -08:00
services/surfaceflinger	remove hack that hardcoded the refresh rate	2011-11-16 00:08:08 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00