Justin Ho dac0a7569c am d9a19ffa: am e6ccc94e: am c312ba32: Merge "Update 4G WiMAX assets for notification area as well Bug: 5724605" into ics-mr1 ... * commit 'd9a19ffa1f4f1a9554a40c7944eddf63f0800edd': Update 4G WiMAX assets for notification area as well Bug: 5724605		2012-02-15 07:53:47 -08:00
cmds	Merge "Fix build warnings"	2012-02-13 16:43:43 -08:00
include	Merge "Clean up InputChannel file descriptor data type."	2012-02-14 17:11:41 -08:00
libs	Merge "Refactored query function from SurfaceTexture into BufferQueue"	2012-02-14 16:29:02 -08:00
opengl	Merge "Don't wrap EGLImageKHR and EGLSyncKHR anymore"	2012-02-14 18:59:47 -08:00
services/surfaceflinger	Merge "Return information about whether overlays are disabled."	2012-02-07 13:46:46 -08:00
MODULE_LICENSE_APACHE2
NOTICE