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

…

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

…

android_hardware_camera2_legacy_LegacyCameraDevice.cpp

…

android_hardware_camera2_legacy_PerfMeasurement.cpp

…

android_hardware_Camera.cpp

…

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

…

android_media_AudioTrack.cpp

…

android_media_JetPlayer.cpp

…

android_media_RemoteDisplay.cpp

…

android_media_ToneGenerator.cpp

…

android_net_LocalSocketImpl.cpp

…

android_net_NetUtils.cpp

…

android_net_TrafficStats.cpp

…

android_nio_utils.cpp

…

android_nio_utils.h

…

android_opengl_EGL14.cpp

…

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

…

android_opengl_GLES31.cpp

…

android_opengl_GLES31Ext.cpp

…

android_os_Debug.cpp

…

android_os_MemoryFile.cpp

…

android_os_MessageQueue.cpp

…

android_os_MessageQueue.h

…

android_os_Parcel.cpp

…

android_os_Parcel.h

…

android_os_SELinux.cpp

…

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

…

android_util_AssetManager.cpp

…

android_util_Binder.cpp

…

android_util_Binder.h

…

android_util_EventLog.cpp

…

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

…

android_view_Surface.cpp

…

android_view_SurfaceControl.cpp

…

android_view_SurfaceSession.cpp

…

android_view_TextureView.cpp

…

android_view_ThreadedRenderer.cpp

…

android_view_VelocityTracker.cpp

…

Android.mk

…

AndroidRuntime.cpp

…

BindTest.cpp

…

com_android_internal_content_NativeLibraryHelper.cpp

…

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

…