OSDN Git Service

resolve merge conflicts of 525a5f2 to master
authorMark Salyzyn <salyzyn@google.com>
Wed, 28 Dec 2016 17:28:53 +0000 (09:28 -0800)
committerMark Salyzyn <salyzyn@google.com>
Wed, 28 Dec 2016 17:29:20 +0000 (09:29 -0800)
commitc03d283e8b3f830d76dd94822b2a13872c05c730
tree514c1b1518ea1b3b863856857ad1cd79b88d00f1
parentf38ec8abdf0a77b3e0e58dbc470a52d2f25a5eb4
parent525a5f2da844d1acc9e405fc4935d8a1cb2ece67
resolve merge conflicts of 525a5f2 to master

Test: build
Change-Id: Id1c6d3d9dd158fb086b0d8ab74f7838ef0a51af1
23 files changed:
cmds/dumpstate/utils.cpp
libs/binder/IMemory.cpp
libs/binder/MemoryHeapBase.cpp
libs/gui/GraphicBufferAlloc.cpp
libs/ui/GraphicBufferAllocator.cpp
opengl/libs/EGL/Loader.cpp
opengl/libs/EGL/eglApi.cpp
services/surfaceflinger/DispSync.cpp
services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp
services/surfaceflinger/DisplayHardware/HWC2On1Adapter.cpp
services/surfaceflinger/DisplayHardware/HWComposer.cpp
services/surfaceflinger/DisplayHardware/HWComposer_hwc1.cpp
services/surfaceflinger/DisplayHardware/PowerHAL.cpp
services/surfaceflinger/FrameTracker.cpp
services/surfaceflinger/RenderEngine/RenderEngine.cpp
services/surfaceflinger/SurfaceFlinger.cpp
services/surfaceflinger/SurfaceFlinger_hwc1.cpp
vulkan/libvulkan/api_gen.cpp
vulkan/libvulkan/code-generator.tmpl
vulkan/libvulkan/driver_gen.cpp
vulkan/libvulkan/layers_extensions.cpp
vulkan/libvulkan/swapchain.cpp
vulkan/nulldrv/null_driver.cpp