The Android Open Source Project 8002c53144 Reconcile with ics-mr1-release ... Change-Id: I1c603308272f9b00174c3f9046171e069ffee566		2011-12-02 07:53:10 -08:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	am 55d3880e: am bb1e7d43: Merge changes I7e973a35,Ib3386fcc into ics-mr1	2011-11-30 10:50:52 -08:00
libs	am f1a4c48b: am e21dabf6: Merge "Initialize bwr.read_buffer in IPCThreadState::talkWithDriver." into ics-mr1	2011-12-01 22:08:20 -08:00
opengl	add a way to access the version string of the h/w implementation of EGL	2011-11-29 18:00:35 -08:00
services/surfaceflinger	am e2970700: am e8ba2aba: Merge "add a way to access the version string of the h/w implementation of EGL" into ics-mr1	2011-11-30 13:57:46 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00