auto import from //branches/cupcake_rel/...@140373

cleanspec.mk

@@ -70,6 +70,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/product/*/obj/SHARED_LIBRARIES/l
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/product/*/obj/SHARED_LIBRARIES/share)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/product/*/obj/SHARED_LIBRARIES/libwebcore_intermediates)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/PinyinIME_intermediates)
 
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

core/build_id.mk

@@ -1,3 +1,3 @@
 # This branch was born out of a naming conventions fix.
 # The decision was to keep the RC names the same.
-export BUILD_ID=CRA71C
+export BUILD_ID=CRA77

target/product/generic.mk

@@ -9,7 +9,6 @@ PRODUCT_PACKAGES := \
     Camera \
     DrmProvider \
     LatinIME \
-    Launcher \
     Mms \
     Music \
     Settings \

tools/droiddoc/src/ClassInfo.java

@@ -1193,7 +1193,7 @@ public class ClassInfo extends DocInfo implements ContainerInfo, Comparable, Sco
         ClassInfo cl = this;
         while (cl != null) {
             PackageInfo pkg = cl.containingPackage();
-            if (pkg.isHidden()) {
+            if (pkg != null && pkg.isHidden()) {
                 return true;
             }
             if (cl.comment().isHidden()) {