Go to file
Jeff Sharkey a36b003bdc am 47e4015b: Merge "Avoid airplane mode labels when Wi-Fi enabled." into ics-mr1
* commit '47e4015ba23c507196980dcb4a311afc7e2358b1':
  Avoid airplane mode labels when Wi-Fi enabled.
2011-11-30 11:46:19 -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