OSDN Git Service

resolve merge conflicts of 404e2b2 to nyc-dev-plus-aosp
authorChih-Hung Hsieh <chh@google.com>
Thu, 19 May 2016 23:22:09 +0000 (16:22 -0700)
committerChih-Hung Hsieh <chh@google.com>
Thu, 19 May 2016 23:22:09 +0000 (16:22 -0700)
commit0a870594527a3af036b1238983abfe4e6118178b
tree00fb32ee1aececd738f876f1ab243529b8fddecc
parent93510f46e0f4be83fae3a81fb7aac61de8728b42
parent404e2b21fc197ab8ad889eef5146845e56eca88d
resolve merge conflicts of 404e2b2 to nyc-dev-plus-aosp

Change-Id: I3c486e83a3f2b27ee0e6bfe4e3bba3df3af758a5
core/jni/android_view_GraphicBuffer.cpp
libs/hwui/DisplayListOp.h
libs/hwui/Matrix.cpp
libs/hwui/OpenGLRenderer.cpp
libs/hwui/Properties.h
libs/hwui/RenderProperties.h
libs/hwui/utils/LinearAllocator.cpp