am cbca9344: am 497c8938: Merge change I24a40dc2 into eclair

Merge commit 'cbca934496ffa7305190fafa85aac7a5c69f2fde' into eclair-mr2-plus-aosp

* commit 'cbca934496ffa7305190fafa85aac7a5c69f2fde':
  Put launcher2 back into its own process.  bug 2241963

Android.mk

@@ -22,7 +22,6 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_PACKAGE_NAME := Launcher2
-LOCAL_CERTIFICATE := shared
 
 LOCAL_OVERRIDES_PACKAGES := Launcher
 

AndroidManifest.xml

@@ -20,8 +20,7 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.launcher2"
-    android:sharedUserId="android.uid.shared"
-    android:sharedUserLabel="@string/uid_name">
+    >
     
     <permission
         android:name="com.android.launcher.permission.INSTALL_SHORTCUT"
@@ -62,7 +61,6 @@
     
     <application
         android:name="LauncherApplication"
-        android:process="android.process.acore"
         android:label="@string/application_name"
         android:icon="@drawable/ic_launcher_home">