Jean-Baptiste Queru 26ce6e0e16 manual merge from readonly-korg-master ... Change-Id: Id17f69d22fbbc84578be5aadd5e8e906ff0eb548		2010-09-10 10:43:36 -07:00
..
etc	resolved conflicts for merge of 0fcbdb41 to gingerbread-plus-aosp	2010-07-29 15:53:16 -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	manual merge from readonly-korg-master	2010-09-10 10:43:36 -07:00
ueventd.rc	DO NOT MERGE resolved conflicts for merge of e95aad61 to kraken	2010-05-17 14:24:36 -04:00