Gloria Wang 59462e25b8 Merge "Re-calculate mCurrentTimeUs for MP3 CBR seek because we might have called Resync() which changes mCurrentPos. For bug 4869063."		2011-08-02 09:56:51 -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	Merge "Refactor input reader to add stylus support. Bug: 5064702"	2011-08-01 17:48:21 -07:00
opengl	connect/disconnect is now called from our EGL wrapper	2011-08-01 14:06:20 -07:00
services/surfaceflinger	Merge "SurfaceFlinger: use async mode for video & cam"	2011-08-01 13:40:29 -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