Go to file
Dianne Hackborn 79206d2174 am db904b47: Merge "Fix issue #5628789: Cannot set static/custom wallpaper after clearing Settings data" into ics-mr1
* commit 'db904b4782a4dfc9d81d5d0616dea3656893b539':
  Fix issue #5628789: Cannot set static/custom wallpaper after clearing Settings data
2011-11-30 10:22:37 -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: add EGL_KHR_fence_sync option 2011-11-29 17:09:01 -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 SurfaceTexture: add EGL_KHR_fence_sync option 2011-11-29 17:09:01 -08:00
MODULE_LICENSE_APACHE2
NOTICE resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp 2011-01-17 14:17:12 -08:00