android_frameworks_base

History

Jean-Baptiste Queru e1dc1d6dc8 Merge commit 'remotes/korg/cupcake'

Conflicts:
	core/java/com/android/internal/app/AlertController.java
	core/res/res/values/strings.xml
	media/java/android/media/AudioSystem.java
	services/java/com/android/server/LocationManagerService.java

2008-12-19 08:31:54 -08:00

android

Code drop from //branches/cupcake/...@124589

2008-12-17 18:05:43 -08:00

server

Code drop from //branches/cupcake/...@124589

2008-12-17 18:05:43 -08:00

ActivityManager.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_bluetooth_BluetoothAudioGateway.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_bluetooth_common.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_bluetooth_common.h

Code drop from //branches/cupcake/...@124589

2008-12-17 18:05:43 -08:00

android_bluetooth_Database.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_bluetooth_HeadsetBase.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_bluetooth_RfcommSocket.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_bluetooth_ScoSocket.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_database_CursorWindow.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_database_SQLiteDatabase.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_database_SQLiteDebug.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_database_SQLiteProgram.cpp

Code drop from //branches/cupcake/...@124589

2008-12-17 18:05:43 -08:00

android_database_SQLiteQuery.cpp

Code drop from //branches/cupcake/...@124589

2008-12-17 18:05:43 -08:00

android_database_SQLiteStatement.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_ddm_DdmHandleNativeHeap.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_debug_JNITest.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_graphics_PixelFormat.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_hardware_Camera.cpp

Code drop from //branches/cupcake/...@124589

2008-12-17 18:05:43 -08:00

android_hardware_SensorManager.cpp

Code drop from //branches/cupcake/...@124589

2008-12-17 18:05:43 -08:00

android_location_GpsLocationProvider.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_media_AudioRecord.cpp

Code drop from //branches/cupcake/...@124589

2008-12-17 18:05:43 -08:00

android_media_AudioSystem.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_media_AudioTrack.cpp

Code drop from //branches/cupcake/...@124589

2008-12-17 18:05:43 -08:00

android_media_ToneGenerator.cpp

Code drop from //branches/cupcake/...@124589

2008-12-17 18:05:43 -08:00

android_message_digest_sha1.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_net_LocalSocketImpl.cpp

Code drop from //branches/cupcake/...@124589

2008-12-17 18:05:43 -08:00

android_net_NetUtils.cpp

Code drop from //branches/cupcake/...@124589

2008-12-17 18:05:43 -08:00

android_net_wifi_Wifi.cpp

Code drop from //branches/cupcake/...@124589

2008-12-17 18:05:43 -08:00

android_nio_utils.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_nio_utils.h

Initial Contribution

2008-10-21 07:00:00 -07:00

android_os_Debug.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_os_Exec.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_os_FileUtils.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_os_Hardware.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_os_MemoryFile.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_os_NetStat.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_os_ParcelFileDescriptor.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_os_Power.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_os_StatFs.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_os_SystemClock.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_os_SystemProperties.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_os_UEventObserver.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_pim_EventRecurrence.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_security_Md5MessageDigest.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_server_BluetoothA2dpService.cpp

Code drop from //branches/cupcake/...@124589

2008-12-17 18:05:43 -08:00

android_server_BluetoothDeviceService.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_server_BluetoothEventLoop.cpp

Code drop from //branches/cupcake/...@124589

2008-12-17 18:05:43 -08:00

android_text_AndroidCharacter.cpp

Code drop from //branches/cupcake/...@124589

2008-12-17 18:05:43 -08:00

android_text_format_Time.cpp

Code drop from //branches/cupcake/...@124589

2008-12-17 18:05:43 -08:00

android_text_KeyCharacterMap.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_util_AssetManager.cpp

Code drop from //branches/cupcake/...@124589

2008-12-17 18:05:43 -08:00

android_util_Base64.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_util_Binder.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_util_Binder.h

Initial Contribution

2008-10-21 07:00:00 -07:00

android_util_EventLog.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_util_FileObserver.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_util_FloatMath.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_util_Log.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_util_Process.cpp

Code drop from //branches/cupcake/...@124589

2008-12-17 18:05:43 -08:00

android_util_StringBlock.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_util_XmlBlock.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_view_Display.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_view_Surface.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

android_view_ViewRoot.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

Android.mk

Merge commit 'remotes/korg/cupcake'

2008-12-19 08:31:54 -08:00

AndroidRuntime.cpp

Code drop from //branches/cupcake/...@124589

2008-12-17 18:05:43 -08:00

BindTest.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

com_android_internal_graphics_NativeUtils.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

com_android_internal_os_ZygoteInit.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

com_google_android_gles_jni_EGLImpl.cpp

Code drop from //branches/cupcake/...@124589

2008-12-17 18:05:43 -08:00

com_google_android_gles_jni_GLImpl.cpp

Code drop from //branches/cupcake/...@124589

2008-12-17 18:05:43 -08:00

CursorWindow.cpp

Initial Contribution

2008-10-21 07:00:00 -07:00

CursorWindow.h

Initial Contribution

2008-10-21 07:00:00 -07:00

GraphicsExternGlue.h

Initial Contribution

2008-10-21 07:00:00 -07:00

GraphicsRegisterGlue.h

Initial Contribution

2008-10-21 07:00:00 -07:00

MODULE_LICENSE_APACHE2

Initial Contribution

2008-10-21 07:00:00 -07:00

NOTICE

Initial Contribution

2008-10-21 07:00:00 -07:00

sqlite3_exception.h

Initial Contribution

2008-10-21 07:00:00 -07:00