Andreas Huber 94547b18a9 am 564fee36: Merge "Make sure we can properly shutdown even if" into ics-mr1 ... * commit '564fee36667e2699c59a29102136220dc2f65862': Make sure we can properly shutdown even if		2011-11-29 14:12:21 -08:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Fix application launch shortcuts.	2011-11-29 12:17:22 -08:00
libs	Merge "don't report an error when disconnecting from an abandoned surfacetexture" into ics-mr1	2011-11-21 17:57:31 -08:00
opengl	Merge "EGL: Use cache sizes defined in the BoardConfig" into ics-mr1	2011-11-21 15:54:54 -08:00
services/surfaceflinger	temporarily hardcode Nexus S refresh rate	2011-11-23 14:51:09 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00