merge from donut

diff --combined core/main.mk
index 71bbc08,aaf5a76..e0489fb
--- 1/core/main.mk
--- 2/core/main.mk
+++ b/core/main.mk
@@@ -253,14 -253,6 +253,14 @@@ ifeq (,$(filter %:system/etc/apns-conf.
      $(warning implicitly installing apns-conf_sdk.xml)
    endif
  endif
 +# Install a vold.conf file is one's not already being installed.
 +ifeq (,$(filter %:system/etc/vold.conf, $(PRODUCT_COPY_FILES)))
 +  PRODUCT_COPY_FILES += \
 +      development/data/etc/vold.conf:system/etc/vold.conf
 +  ifeq ($(filter eng tests,$(TARGET_BUILD_VARIANT)),)
 +    $(warning implicitly installing vold.conf)
 +  endif
 +endif
  # If we're on an eng or tests build, but not on the sdk, and we have
  # a better one, use that instead.
  ifneq ($(filter eng tests,$(TARGET_BUILD_VARIANT)),)
@@@ -339,6 -331,7 +339,7 @@@ ifeq ($(SDK_ONLY),true
  subdirs := \
        prebuilt \
        build/libs/host \
+       build/tools/zipalign \
        dalvik/dexdump \
        dalvik/libdex \
        dalvik/tools/dmtracedump \
@@@ -366,7 -359,6 +367,6 @@@ ifneq (,$(shell which javac 2>/dev/null
  $(warning sdk-only: javac available.)
  subdirs += \
        build/tools/signapk \
-       build/tools/zipalign \
        dalvik/dx \
        dalvik/libcore \
        development/apps \

diff --combined tools/droiddoc/src/ClassInfo.java
index 869142e,8180436..5c61941
--- 1/tools/droiddoc/src/ClassInfo.java
--- 2/tools/droiddoc/src/ClassInfo.java
+++ b/tools/droiddoc/src/ClassInfo.java
@@@ -378,7 -378,7 +378,7 @@@ public class ClassInfo extends DocInfo 
  
      public TagInfo[] deprecatedTags()
      {
 -        // should we also do the interfaces?
 +        // Should we also do the interfaces?
          return comment().deprecatedTags();
      }
  
@@@ -863,6 -863,7 +863,7 @@@
          data.setValue(base + ".kind", this.kind());
          TagInfo.makeHDF(data, base + ".shortDescr", this.firstSentenceTags());
          TagInfo.makeHDF(data, base + ".deprecated", deprecatedTags());
+         data.setValue(base + ".since", getSince());
      }
  
      /**