Xavier Ducrohet 0795000832 am d98e1be2: am f4750724: am 9d829f98: am 21e6e2de: Merge "Change generated dependency file names" ... * commit 'd98e1be20e1cca5c36c7e0344500d4a5574568aa': Change generated dependency file names		2011-08-18 14:51:43 -07:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Merge "SurfaceTexture: fix queues-to-composer"	2011-08-18 14:31:39 -07:00
libs	Merge "SurfaceTexture: fix queues-to-composer"	2011-08-18 14:31:39 -07:00
opengl	fix test-opengl-swapinterval	2011-08-15 15:25:40 -07:00
services/surfaceflinger	SurfaceTexture: fix queues-to-composer	2011-08-17 18:19:00 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00