Gloria Wang 676f7e146c resolved conflicts for merge of 845fdba7 to master ... Change-Id: I716b6ceb03bd733f9e7f49008112c8f2c53ad9ce		2011-08-04 15:13:14 -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
NOTICE