Brian Swetland d06df51bcd resolved conflicts for merge of 3b5214a6 to master ... Change-Id: Id73c53c6c2e9c21eb9b1d1e624aaeb25097ea7a4		2010-09-19 04:35:19 -07:00
..
etc	am 60c8f863: resolved conflicts for merge of 0fcbdb41 to gingerbread-plus-aosp	2010-07-29 15:55:34 -07:00
Android.mk	merge from open-source master	2010-07-16 13:22:23 -07:00
init.lowmem.rc	Update OOM adj levels.	2010-06-10 17:52:37 -07:00
init.rc	resolved conflicts for merge of 3b5214a6 to master	2010-09-19 04:35:19 -07:00
ueventd.rc	Revert "system/core: add system/audio persmissions for /dev/audio*"	2010-07-30 19:58:31 -07:00