OSDN Git Service

Merge commit 'korg/cupcake'
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 27 Mar 2009 22:38:40 +0000 (15:38 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 27 Mar 2009 22:38:40 +0000 (15:38 -0700)
commite1861133d51b9e6a6f658eb366630ad4f4d3ff8f
tree046aaac6d455ccd57d38f3a13df44ecd13ac0322
parentd91450e1169b3a57b3507fe86d947de05549f4ed
parent3f2fd987b230740e1b28ccb541d1181cb2187ae6
Merge commit 'korg/cupcake'

Conflicts:
core/java/android/webkit/WebView.java
core/java/android/widget/TwoLineListItem.java
preloaded-classes
13 files changed:
api/current.xml
core/java/android/content/Intent.java
core/java/android/provider/Contacts.java
core/java/android/webkit/WebSettings.java
core/java/android/webkit/WebView.java
core/java/android/widget/AbsSeekBar.java
core/res/res/values/strings.xml
libs/audioflinger/AudioFlinger.cpp
libs/surfaceflinger/SurfaceFlinger.cpp
media/libmediaplayerservice/MediaPlayerService.cpp
preloaded-classes
services/java/com/android/server/BatteryService.java
telephony/java/com/android/internal/telephony/gsm/RIL.java