ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity
732ca39b70
replicant-frameworks_native/libs
History
Jean-Baptiste Queru 732ca39b70 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
2009-03-18 11:33:14 -07:00
..
audioflinger Merge commit 'remotes/korg/cupcake' into merge 2009-03-18 11:33:14 -07:00
surfaceflinger Merge commit 'remotes/korg/cupcake' into merge 2009-03-18 11:33:14 -07:00
ui
utils Merge commit 'remotes/korg/cupcake' into merge 2009-03-18 11:33:14 -07:00