Jim Miller f14ab8db48 am 2f35281a: Merge "Fix 5485925: Fix crash in transport control view" into ics-mr0 ... * commit '2f35281ae0ae4471527e9286f022cb960384044e': Fix 5485925: Fix crash in transport control view		2011-10-19 20:50:45 -07:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	am 70ac412b: Merge "Add a LayerScreenshot" into ics-mr0	2011-10-18 23:00:08 -07:00
libs	am 827d069a: Merge "SurfaceTexture: free buffers when disconnect fails" into ics-mr0	2011-10-19 11:08:11 -07:00
opengl	don't log EGL errors due to unimplemented proprietary extensions	2011-10-05 19:15:32 -07:00
services/surfaceflinger	am 70ac412b: Merge "Add a LayerScreenshot" into ics-mr0	2011-10-18 23:00:08 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00