Wink Saville cb8c7597c3 resolved conflicts for merge of 7bb2d942 to master ... Change-Id: I026b01805c81d8b26d22e4a195e5e38655a34d32		2011-08-05 11:40:22 -07:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Refactor input reader to add stylus support.	2011-07-31 15:38:09 -07:00
libs	Add a 'release' method to the SurfaceTexture public Java API	2011-08-03 17:23:44 -07:00
opengl	connect/disconnect is now called from our EGL wrapper	2011-08-01 14:06:20 -07:00
services/surfaceflinger	fix a crasher in surfaceflinger	2011-08-02 18:29:57 -07:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00