merge from eclair

diff --cc core/java/android/text/InputType.java
Simple merge

diff --cc core/java/android/widget/TextView.java
Simple merge

diff --cc docs/html/guide/publishing/versioning.jd
Simple merge

diff --cc include/media/PVPlayer.h
index de7a041,8a66152..a5ca09f
--- 1/include/media/PVPlayer.h
--- 2/include/media/PVPlayer.h
+++ b/include/media/PVPlayer.h
@@@ -52,6 -53,10 +53,10 @@@ public
      virtual status_t    reset();
      virtual status_t    setLooping(int loop);
      virtual player_type playerType() { return PV_PLAYER; }
 -    virtual status_t    invoke(const Parcel& request, Parcel *reply);
++    virtual status_t    invoke(const Parcel& request, Parcel *reply) { return 0; }
+     virtual status_t    getMetadata(
+         const SortedVector<media::Metadata::Type>& ids,
 -        Parcel *records);
++        Parcel *records) { return 0; }
  
      // make available to PlayerDriver
      void        sendEvent(int msg, int ext1=0, int ext2=0) { MediaPlayerBase::sendEvent(msg, ext1, ext2); }

diff --cc include/media/mediaplayer.h
Simple merge

diff --cc media/java/android/media/MediaPlayer.java
Simple merge

diff --cc opengl/libagl/egl.cpp
Simple merge

diff --cc services/java/com/android/server/LocationManagerService.java
Simple merge

diff --cc services/java/com/android/server/am/ActivityManagerService.java
Simple merge

diff --cc tools/aapt/Command.cpp
Simple merge