repo sync da17dee033 resolved conflicts for merge of 35ad5f41 to eclair-plus-aosp		2009-09-16 15:00:36 -07:00
..
etc	merge from open-source master	2009-09-01 08:28:21 -07:00
Android.mk	Fix a bug that prevented the "generic" product builds from working in the emulator.	2009-09-08 16:03:49 -07:00
init.rc	am 7baff71b: rootdir: init.rc: tweak cfs scheduler - disable child_runs_first	2009-09-16 14:37:39 -07:00