OSDN Git Service

DO NOT MERGE resolved conflicts for merge of 951f2347 to lmp-mr1-ub-dev
authorJohn Reck <jreck@google.com>
Thu, 14 May 2015 14:38:07 +0000 (07:38 -0700)
committerJohn Reck <jreck@google.com>
Thu, 14 May 2015 14:38:11 +0000 (07:38 -0700)
commit570b2052bb8eec8c510941b0a6d77262df28b922
treee40995ea837a4a2174f68ff6c279c55ab05fbbae
parent7238435e9b3f133965b63abc7b352b34f9401af5
parent951f23478d79fb232e93a750d9050adce7a67874
DO NOT MERGE resolved conflicts for merge of 951f2347 to lmp-mr1-ub-dev

Change-Id: Ic392bf6f2cf9e9bf526b6ea63a3be7e50420e7d1
core/java/android/app/ActivityThread.java
core/jni/android_view_Surface.cpp
core/jni/android_view_ThreadedRenderer.cpp
libs/hwui/Android.mk
libs/hwui/renderthread/CanvasContext.cpp
libs/hwui/renderthread/RenderProxy.cpp
libs/hwui/renderthread/RenderThread.cpp
libs/hwui/tests/main.cpp