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

This commit is contained in:
The Android Open Source Project 2009-03-18 17:39:42 -07:00
parent 760cda0e37
commit f122bec404
4 changed files with 3 additions and 3 deletions

View file

@ -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

View file

@ -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

View file

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

View file

@ -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()) {