Andreas Huber 6304b42833 resolved conflicts for merge of 26f70db9 to master ... Change-Id: Ib1536b1a4c9eeff80e0726b3e61cee12057cd120		2011-11-08 10:40:20 -08:00
cmds
include
libs	Fix possible leak in Parcel::writeDupFileDescriptor.	2011-11-07 12:22:39 -08:00
opengl
services/surfaceflinger	Merge "Fix rotation displays frame N-1 briefly while rotating" into ics-mr1	2011-11-07 21:33:53 -08:00
MODULE_LICENSE_APACHE2
NOTICE