| commit | 8374f8fce997c0e1df39f0b515ca494b0a15dbdc | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Mar 18 11:33:14 2009 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Wed Mar 18 11:33:14 2009 -0700 |
| tree | 2c7a31052a78e7e8722c74fc798e6333f054f06f | |
| parent | eb7dc8939c06a1755d7c82baf0d0d008aa4d5fcb [diff] | |
| parent | c048cae0367db6fbb4fe1127be5011910713d4ad [diff] |
Merge commit 'remotes/korg/cupcake' into merge Conflicts: core/java/android/view/animation/TranslateAnimation.java core/jni/Android.mk core/res/res/values-en-rGB/strings.xml libs/audioflinger/AudioFlinger.cpp libs/surfaceflinger/LayerScreenshot.cpp packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java