merge from eclair

diff --cc buildspec.mk.default
Simple merge

diff --cc core/build_id.mk
index 060c9b5,4661aea..40bb35d
--- 1/core/build_id.mk
--- 2/core/build_id.mk
+++ b/core/build_id.mk
@@@ -23,7 -23,7 +23,7 @@@
  # (like "TC1-RC5").  It must be a single word, and is
  # capitalized by convention.
  #
- BUILD_ID := Donut
 -BUILD_ID := ECLAIR
++BUILD_ID := MASTER
  
  # DISPLAY_BUILD_NUMBER should only be set for development branches,
  # If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for

diff --cc core/prelink-linux-arm.map
index eb42ad3,30fa378..64149bc
--- 1/core/prelink-linux-arm.map
--- 2/core/prelink-linux-arm.map
+++ b/core/prelink-linux-arm.map
@@@ -64,14 -66,20 +66,21 @@@ libacc.so               0xAC60000
  
  libexif.so              0xAC500000
  libui.so                0xAC400000
- libsgl.so               0xAC000000
+ # libsgl is for backward-compatibility with donut
+ libsgl.so               0xAC200000
+ libskia.so              0xAC000000
+ librs_jni.so            0xABF00000
+ libRS.so                0xAB900000
+ 
  
  # audio
- libFLAC.so              0xAB900000
- libspeech.so            0xAB800000
++libFLAC.so              0xAB8A0000
+ libaudiopolicy.so       0xAB880000
+ libaudiopolicygeneric.so 0xAB800000
+ libsoundpool.so         0xAB780000
  libaudio.so             0xAB700000
- libsonivox.so           0xAB600000
- libsoundpool.so         0xAB500000
+ libspeech.so            0xAB600000
+ libsonivox.so           0xAB500000
  libvorbisidec.so        0xAB400000
  libmedia_jni.so         0xAB300000
  libmediaplayerservice.so 0xAB280000

diff --cc core/version_defaults.mk
index 0e6cf5c,fd41239..7115eac
--- 1/core/version_defaults.mk
--- 2/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@@ -41,7 -41,7 +41,7 @@@ ifeq "" "$(PLATFORM_VERSION)
    # which is the version that we reveal to the end user.
    # Update this value when the platform version changes (rather
    # than overriding it somewhere else).  Can be an arbitrary string.
-   PLATFORM_VERSION := 1.6
 -  PLATFORM_VERSION := Eclair
++  PLATFORM_VERSION := AOSP
  endif
  
  ifeq "" "$(PLATFORM_SDK_VERSION)"
@@@ -57,9 -57,9 +57,9 @@@
  endif
  
  ifeq "" "$(PLATFORM_VERSION_CODENAME)"
-   # If the build is not a final release build, then this is the current
-   # development code-name.  If this is a final release build, it is simply "REL".
-   PLATFORM_VERSION_CODENAME := REL
+   # This is the current development code-name, if the build is not a final
+   # release build.  If this is a final release build, it is simply "REL".
 -  PLATFORM_VERSION_CODENAME := Eclair
++  PLATFORM_VERSION_CODENAME := AOSP
  endif
  
  ifeq "" "$(DEFAULT_APP_TARGET_SDK)"

diff --cc tools/droiddoc/templates/assets/android-developer-docs.css
Simple merge