Go to file
Scott Main 55ec71116f Merge changes I1df85b6a,I7c6a68b6 into ics-mr1
* changes:
  docs: second set of diagram updates
  docs: Update lifecycle diagrams to use new omnigraffle designs; add corresponding graffle files update discussion of activity state restore for clarification
2012-01-05 09:42:52 -08:00
cmds Remove the simulator target from all makefiles. 2011-07-11 22:12:16 -07:00
include Merge changes I7e973a35,Ib3386fcc into ics-mr1 2011-11-29 17:46:35 -08:00
libs SurfaceTexture: fix a verbose-log compile error 2011-12-09 15:07:44 -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 SurfaceFlinger: fix layer removal race condition 2011-12-02 10:03:25 -08:00
MODULE_LICENSE_APACHE2
NOTICE resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp 2011-01-17 14:17:12 -08:00