resolved conflicts for merge of b013bfc1 to honeycomb-plus-aosp

Change-Id: I159dd58c403bc38f9637163d8cd5e6270e4f201c

rootdir/etc/ueventd.goldfish.rc

+1 −0

Original line number	Diff line number	Diff line
		# These settings are specific to running under the Android emulator
		/dev/qemu_trace 0666 system system
		/dev/qemu_pipe 0666 system system
		/dev/ttyS* 0666 system system
		/proc 0666 system system