]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ae0a25e 12e28f4)
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)
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


Trivial merge
mirror of aapt