Robert Greenwalt 359ccfaff4 am 7a08ef44: am e3776a47: am fc19160a: Merge "Add a config to set Dun capabilities." into ics-mr1 ... * commit '7a08ef442ad6138352785690a8e341607d763399': Add a config to set Dun capabilities.		2012-02-15 07:53:51 -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	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00