Jean-Baptiste Queru 30be93c6e2 am 60c8f863: resolved conflicts for merge of 0fcbdb41 to gingerbread-plus-aosp ... Merge commit '60c8f863ca84f3e5bb8e78d8001c53511f094d53' * commit '60c8f863ca84f3e5bb8e78d8001c53511f094d53': Userland support for VM interconnection		2010-07-29 15:55:34 -07:00
..
dbus.conf	auto import from //depot/cupcake/@135843	2009-03-03 19:32:55 -08:00
hosts	auto import from //depot/cupcake/@135843	2009-03-03 19:32:55 -08:00
init.goldfish.rc	init.rc: Move SD card support to device specific init.rc files	2010-06-15 22:48:30 -07:00
init.goldfish.sh	Userland support for VM interconnection	2010-07-15 13:19:37 +02:00
init.testmenu	auto import from //depot/cupcake/@135843	2009-03-03 19:32:55 -08:00
mountd.conf	auto import from //depot/cupcake/@135843	2009-03-03 19:32:55 -08:00
ueventd.goldfish.rc	init: Add ueventd.rc parsing to ueventd	2010-04-21 20:59:42 -07:00
vold.fstab	generic_rootdir: vold_fstab: Change '/sdcard' -> '/mnt/sdcard'	2010-02-19 18:38:28 -08:00