Nick Pelly 018077739b am fb52c474: am a26cf301: Merge "Enforce 1-1 relationship between context and NfcAdapterExtras." into ics-mr1 ... * commit 'fb52c4747687819238eb4570ee7d424842c6159f': Enforce 1-1 relationship between context and NfcAdapterExtras.		2011-11-15 11:30:10 -08:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Merge "Clean up GenerationCache."	2011-11-14 18:28:59 -08:00
libs	am 738d8cae: am c93a151f: Merge "Define, document, and test the behavior of very large SurfaceTextures" into ics-mr1	2011-11-14 11:54:38 -08:00
opengl	Merge "EGL: add the ANDROID suffix to the blob cache ext" into ics-mr1	2011-11-14 17:36:46 -08:00
services/surfaceflinger	Back to 59fps	2011-11-09 17:54:37 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00