Brian Carlstrom d3f0e0ae37 resolved conflicts for merge of 02e8d730 to jb-mr2-dev-plus-aosp ... Change-Id: I63d6a2f975a6c0df5c238a2f7592f357441eb767		2013-04-03 14:03:13 -07:00
..
etc	move goldfish stuffs to device/generic/goldfish	2013-03-05 11:16:36 -08:00
Android.mk	move goldfish stuffs to device/generic/goldfish	2013-03-05 11:16:36 -08:00
init.rc	resolved conflicts for merge of 02e8d730 to jb-mr2-dev-plus-aosp	2013-04-03 14:03:13 -07:00
init.trace.rc	init.trace.rc: Set perms for power/clock_set_rate events	2012-10-15 17:16:55 -07:00
init.usb.rc	Revert "init.usb.rc: set sys.usb.config to none before changing it"	2013-01-15 17:37:32 -08:00
ueventd.rc	second user doesnot pickup input operations from A2DP	2012-10-16 17:32:51 -07:00