frameworks_base.git - frameworks/base

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge commit 'remotes/korg/cupcake' into merge	Jean-Baptiste Queru	2009-03-18	1	-0/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	auto import from //branches/cupcake_rel/...@138607	The Android Open Source Project	2009-03-13	1	-0/+1
\| \|
\| *	auto import from //depot/cupcake/@135843	The Android Open Source Project	2009-03-03	1	-0/+33
\| \|
\| *	auto import from //depot/cupcake/@135843	The Android Open Source Project	2009-03-03	1	-33/+0
\| \|
* \|	Add a few missing headers	Alexey Zaytsev	2008-10-21	1	-0/+1
\|/ \| \| \| \| \|	Fixes build with gcc 4.3.2 Signed-off-by: Alexey Zaytsev <alexey.zaytsev@gmail.com>
*	Initial Contribution	The Android Open Source Project	2008-10-21	1	-0/+33