| commit | 732ca39b704428b77ef305826d4e6c07190fd7ed | [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 | 0b575888c39771713beb00a816479b1cdf53242e | |
| parent | 15c399644d0bd343ef9ed23ccb117e49a0eb7f82 [diff] | |
| parent | ebad147e654682b6f05438ca8f3685809df5d2e2 [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