auto import from //branches/cupcake_rel/...@140373
diff --git a/cleanspec.mk b/cleanspec.mk
index ab1e5f1..290319c 100644
--- a/cleanspec.mk
+++ b/cleanspec.mk
@@ -70,6 +70,7 @@
$(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
diff --git a/core/build_id.mk b/core/build_id.mk
index 03af5f5..8d31dac 100755
--- a/core/build_id.mk
+++ b/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
diff --git a/target/product/generic.mk b/target/product/generic.mk
index e32e657..b9bc070 100644
--- a/target/product/generic.mk
+++ b/target/product/generic.mk
@@ -9,7 +9,6 @@
Camera \
DrmProvider \
LatinIME \
- Launcher \
Mms \
Music \
Settings \
diff --git a/tools/droiddoc/src/ClassInfo.java b/tools/droiddoc/src/ClassInfo.java
index 36edbf8..a3fcc92 100644
--- a/tools/droiddoc/src/ClassInfo.java
+++ b/tools/droiddoc/src/ClassInfo.java
@@ -1193,7 +1193,7 @@
ClassInfo cl = this;
while (cl != null) {
PackageInfo pkg = cl.containingPackage();
- if (pkg.isHidden()) {
+ if (pkg != null && pkg.isHidden()) {
return true;
}
if (cl.comment().isHidden()) {