]> git.saurik.com Git - android/aapt.git/commit
Merge commit 'remotes/korg/cupcake' into merge
authorJean-Baptiste Queru <jbq@google.com>
Wed, 18 Mar 2009 18:33:14 +0000 (11:33 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 18 Mar 2009 18:33:14 +0000 (11:33 -0700)
commite2d795d9f2b0baed768f23bce1944fdf52803331
treed72bba68d6a3d9a8c2320c0ba86780172a565cf5
parentae0a25e10cf864d00b4e381dbc134057e4f4e598
parent12e28f48771c23798b0285c1aa8a1102ec1d11e9
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