Robert Greenwalt e120c1a39c am 1b2583c4: am 7874efeb: am c8711ca7: Merge "Stop using shared DUN APN when tethering stops." into ics-mr1 ... * commit '1b2583c41c37c055821d8f4ebbdc717f108c3b48': Stop using shared DUN APN when tethering stops.		2012-02-15 07:53:53 -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