James Dong a2fd1773ba Merge "Revert "Add some logging to track down where ANR happens during MediaPlayer._release().""		2011-07-14 16:42:34 -07:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Remove some #ifdef HAVE_ANDROID_OS that were needed for the simulator build	2011-07-13 19:45:44 -04:00
libs	Provide more descriptive name for InputChannel ashmem.	2011-07-13 22:27:37 -07:00
opengl	Merge "Remove the simulator target from all makefiles. Bug: 5010576"	2011-07-12 12:15:07 -07:00
services/surfaceflinger	take the state transform into account with h/w composer hal	2011-07-12 14:51:45 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00