Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/system/core into eclair-mr2-plus-aosp

This commit is contained in:
Romain Guy 2009-10-07 12:43:05 -07:00 committed by Android Git Automerger
commit 1f29a94bc4

View file

@ -164,8 +164,6 @@ on boot
setprop ro.CONTENT_PROVIDER_MEM 5632
setprop ro.EMPTY_APP_MEM 6144
mount debugfs /sys/kernel/debug /sys/kernel/debug
# Write value must be consistent with the above properties.
# Note that the driver only supports 6 slots, so we have HOME_APP at the
# same memory level as services.