Leon Scroggins III 8c9ae41bc7 am 303581be: resolved conflicts for merge of 3ff978a5 to cw-d-mr1-dev ...

* commit '303581be5ba3875b0501cb8aa00a0228e22a6cc6':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes

2015-06-12 16:29:07 +00:00

..

android

am 303581be: resolved conflicts for merge of 3ff978a5 to cw-d-mr1-dev

2015-06-12 16:29:07 +00:00

android_animation_PropertyValuesHolder.cpp

…

android_app_backup_FullBackup.cpp

…

android_app_NativeActivity.cpp

…

android_backup_BackupDataInput.cpp

…

android_backup_BackupDataOutput.cpp

…

android_backup_BackupHelperDispatcher.cpp

…

android_backup_FileBackupHelperBase.cpp

…

android_content_res_Configuration.cpp

…

android_content_res_ObbScanner.cpp

…

android_database_CursorWindow.cpp

…

android_database_SQLiteCommon.cpp

…

android_database_SQLiteCommon.h

…

android_database_SQLiteConnection.cpp

…

android_database_SQLiteDebug.cpp

…

android_database_SQLiteGlobal.cpp

…

android_ddm_DdmHandleNativeHeap.cpp

…

android_emoji_EmojiFactory.cpp

…

android_graphics_Canvas.cpp

…

android_graphics_Picture.cpp

…

android_hardware_camera2_CameraMetadata.cpp

…

android_hardware_camera2_DngCreator.cpp

resolve merge conflicts of 0f647c1 to lmp-mr1-dev-plus-aosp.

2015-01-09 17:19:45 -08:00

android_hardware_camera2_legacy_LegacyCameraDevice.cpp

am f5d30463: am 4fa3a80b: am a5f301c7: Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev

2015-02-12 05:54:34 +00:00

android_hardware_camera2_legacy_PerfMeasurement.cpp

…

android_hardware_Camera.cpp

am 1334a6f3: am 8d47bc97: Merge "Camera: Clarify JNI exception message" into lmp-mr1-dev

2015-01-15 20:13:11 +00:00

android_hardware_location_ActivityRecognitionHardware.cpp

…

android_hardware_SensorManager.cpp

…

android_hardware_SerialPort.cpp

…

android_hardware_SoundTrigger.cpp

…

android_hardware_UsbDevice.cpp

…

android_hardware_UsbDeviceConnection.cpp

…

android_hardware_UsbRequest.cpp

…

android_media_AudioErrors.h

…

android_media_AudioFormat.h

…

android_media_AudioRecord.cpp

…

android_media_AudioSystem.cpp

resolved conflicts for merge of 5196dd04 to lmp-mr1-dev-plus-aosp

2014-12-10 10:42:08 -08:00

android_media_AudioTrack.cpp

…

android_media_JetPlayer.cpp

…

android_media_RemoteDisplay.cpp

…

android_media_ToneGenerator.cpp

…

android_net_LocalSocketImpl.cpp

…

android_net_NetUtils.cpp

Remove hardcoded include paths.

2014-12-31 10:06:51 +00:00

android_net_TrafficStats.cpp

…

android_nio_utils.cpp

…

android_nio_utils.h

…

android_opengl_EGL14.cpp

Update autogenerated gl functions.

2015-02-23 10:47:19 -08:00

android_opengl_EGLExt.cpp

…

android_opengl_GLES10.cpp

…

android_opengl_GLES10Ext.cpp

…

android_opengl_GLES11.cpp

…

android_opengl_GLES11Ext.cpp

…

android_opengl_GLES20.cpp

…

android_opengl_GLES30.cpp

Update autogenerated gl functions.

2015-02-23 10:47:19 -08:00

android_opengl_GLES31.cpp

…

android_opengl_GLES31Ext.cpp

…

android_os_Debug.cpp

am 45838de9: fix Uss accounting in getPssPid()

2014-12-12 04:30:52 +00:00

android_os_MemoryFile.cpp

…

android_os_MessageQueue.cpp

…

android_os_MessageQueue.h

…

android_os_Parcel.cpp

…

android_os_Parcel.h

…

android_os_SELinux.cpp

Drop unusable SELinux APIs.

2015-03-13 14:09:26 -04:00

android_os_SystemClock.cpp

…

android_os_SystemProperties.cpp

…

android_os_Trace.cpp

…

android_os_UEventObserver.cpp

…

android_server_FingerprintManager.cpp

…

android_server_NetworkManagementSocketTagger.cpp

…

android_server_Watchdog.cpp

…

android_text_AndroidBidi.cpp

…

android_text_AndroidCharacter.cpp

…

android_text_StaticLayout.cpp

Use the icu:: namespace for icu4c API.

2015-03-07 11:00:50 -08:00

android_util_AssetManager.cpp

…

android_util_Binder.cpp

…

android_util_Binder.h

…

android_util_EventLog.cpp

jni: Add paranoia regarding android_logger_list_read

2015-02-26 14:49:17 -08:00

android_util_FileObserver.cpp

…

android_util_Log.cpp

…

android_util_Log.h

…

android_util_Process.cpp

…

android_util_StringBlock.cpp

…

android_util_XmlBlock.cpp

…

android_view_DisplayEventReceiver.cpp

…

android_view_GLES20Canvas.cpp

…

android_view_GraphicBuffer.cpp

…

android_view_GraphicBuffer.h

…

android_view_HardwareLayer.cpp

…

android_view_InputChannel.cpp

…

android_view_InputChannel.h

…

android_view_InputDevice.cpp

…

android_view_InputDevice.h

…

android_view_InputEventReceiver.cpp

…

android_view_InputEventSender.cpp

…

android_view_InputQueue.cpp

…

android_view_KeyCharacterMap.cpp

…

android_view_KeyCharacterMap.h

…

android_view_KeyEvent.cpp

…

android_view_KeyEvent.h

…

android_view_MotionEvent.cpp

…

android_view_MotionEvent.h

…

android_view_PointerIcon.cpp

…

android_view_PointerIcon.h

…

android_view_RenderNode.cpp

…

android_view_RenderNodeAnimator.cpp

am 7d74cb6c: am 14c43689: Merge "Fix issue with RNA destruction mid-animation" into lmp-mr1-dev

2014-12-09 22:18:27 +00:00

android_view_Surface.cpp

DO NOT MERGE resolved conflicts for merge of 951f2347 to lmp-mr1-ub-dev

2015-05-14 07:38:11 -07:00

android_view_SurfaceControl.cpp

…

android_view_SurfaceSession.cpp

…

android_view_TextureView.cpp

…

android_view_ThreadedRenderer.cpp

DO NOT MERGE resolved conflicts for merge of 951f2347 to lmp-mr1-ub-dev

2015-05-14 07:38:11 -07:00

android_view_VelocityTracker.cpp

…

Android.mk

Use the icu:: namespace for icu4c API.

2015-03-07 11:00:50 -08:00

AndroidRuntime.cpp

Merge "Load libraries directly from apk"

2015-04-07 17:28:15 +00:00

BindTest.cpp

…

com_android_internal_content_NativeLibraryHelper.cpp

Load libraries directly from apk

2015-04-07 17:25:23 +00:00

com_android_internal_net_NetworkStatsFactory.cpp

…

com_android_internal_os_Zygote.cpp

…

com_android_internal_util_VirtualRefBasePtr.cpp

…

com_android_internal_view_animation_NativeInterpolatorFactoryHelper.cpp

…

com_google_android_gles_jni_EGLImpl.cpp

…

com_google_android_gles_jni_GLImpl.cpp

…

core_jni_helpers.h

…

GraphicsExternGlue.h

…

GraphicsRegisterGlue.h

…

MODULE_LICENSE_APACHE2

…

NOTICE

…