Mike Lockwood 726a570258 resolved conflicts for merge of dfaf2e03 to master ...

Change-Id: I440d2042dd404a421789063e42102699fa33b7c0

2009-11-25 15:05:51 -05:00

..

android

…

ActivityManager.cpp

…

android_backup_BackupDataInput.cpp

…

android_backup_BackupDataOutput.cpp

…

android_backup_BackupHelperDispatcher.cpp

…

android_backup_FileBackupHelperBase.cpp

…

android_bluetooth_BluetoothAudioGateway.cpp

…

android_bluetooth_BluetoothSocket.cpp

…

android_bluetooth_common.cpp

…

android_bluetooth_common.h

…

android_bluetooth_HeadsetBase.cpp

…

android_bluetooth_ScoSocket.cpp

…

android_database_CursorWindow.cpp

…

android_database_SQLiteCompiledSql.cpp

…

android_database_SQLiteDatabase.cpp

…

android_database_SQLiteDebug.cpp

…

android_database_SQLiteProgram.cpp

…

android_database_SQLiteQuery.cpp

…

android_database_SQLiteStatement.cpp

…

android_ddm_DdmHandleNativeHeap.cpp

…

android_debug_JNITest.cpp

…

android_emoji_EmojiFactory.cpp

…

android_graphics_PixelFormat.cpp

…

android_hardware_Camera.cpp

…

android_hardware_SensorManager.cpp

…

android_location_GpsLocationProvider.cpp

…

android_media_AudioRecord.cpp

…

android_media_AudioSystem.cpp

…

android_media_AudioTrack.cpp

…

android_media_JetPlayer.cpp

…

android_media_ToneGenerator.cpp

…

android_message_digest_sha1.cpp

…

android_net_LocalSocketImpl.cpp

…

android_net_NetUtils.cpp

…

android_net_wifi_Wifi.cpp

…

android_nio_utils.cpp

…

android_nio_utils.h

…

android_opengl_GLES10.cpp

…

android_opengl_GLES10Ext.cpp

…

android_opengl_GLES11.cpp

…

android_opengl_GLES11Ext.cpp

…

android_opengl_GLES20.cpp

…

android_os_Debug.cpp

…

android_os_FileUtils.cpp

…

android_os_MemoryFile.cpp

…

android_os_ParcelFileDescriptor.cpp

…

android_os_Power.cpp

…

android_os_StatFs.cpp

…

android_os_SystemClock.cpp

…

android_os_SystemProperties.cpp

…

android_os_UEventObserver.cpp

…

android_pim_EventRecurrence.cpp

…

android_security_Md5MessageDigest.cpp

…

android_server_BluetoothA2dpService.cpp

…

android_server_BluetoothEventLoop.cpp

…

android_server_BluetoothService.cpp

…

android_text_AndroidCharacter.cpp

…

android_text_format_Time.cpp

…

android_text_KeyCharacterMap.cpp

…

android_util_AssetManager.cpp

…

android_util_Base64.cpp

…

android_util_Binder.cpp

…

android_util_Binder.h

…

android_util_EventLog.cpp

…

android_util_FileObserver.cpp

…

android_util_FloatMath.cpp

…

android_util_Log.cpp

…

android_util_Process.cpp

…

android_util_StringBlock.cpp

…

android_util_XmlBlock.cpp

…

android_view_Display.cpp

…

android_view_Surface.cpp

…

android_view_ViewRoot.cpp

…

Android.mk

resolved conflicts for merge of dfaf2e03 to master

2009-11-25 15:05:51 -05:00

AndroidRuntime.cpp

resolved conflicts for merge of dfaf2e03 to master

2009-11-25 15:05:51 -05:00

BindTest.cpp

…

com_android_internal_graphics_NativeUtils.cpp

…

com_android_internal_os_ZygoteInit.cpp

…

com_google_android_gles_jni_EGLImpl.cpp

…

com_google_android_gles_jni_GLImpl.cpp

…

CursorWindow.cpp

…

CursorWindow.h

…

GraphicsExternGlue.h

…

GraphicsRegisterGlue.h

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

sqlite3_exception.h

…

Time.cpp

…

TimeUtils.h

…