From: Jean-Baptiste Queru <jbq@google.com>
Date: Wed, 18 Mar 2009 18:33:14 +0000 (-0700)
Subject: Merge commit 'remotes/korg/cupcake' into merge
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/e2d795d9f2b0baed768f23bce1944fdf52803331?hp=-c

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
---

e2d795d9f2b0baed768f23bce1944fdf52803331