| commit | 2a73de7b21a89aa2ba4c254d28658b49793425b2 | [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 | ded5bcd581464b4174d81c373044b6d36eee58d2 | |
| parent | 42e48026b21a962e5bf40344d738665ecbd9d74d [diff] | |
| parent | ba87e3e6c985e7175152993b5efcc7dd2f0e1c93 [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