OSDN Git Service

Merge changes from topic 'layer-wp-race' into oc-dev
authorChia-I Wu <olv@google.com>
Sat, 17 Jun 2017 01:58:33 +0000 (01:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 17 Jun 2017 01:58:33 +0000 (01:58 +0000)
commitc35a5e29f3c4c05041ac0f4a0bcbfe669d3d67bc
tree7f5f05346183140b1dc3e2957ac3426358a198c9
parent05e6335833def242d3e53ed8fefeb0de35cd6a10
parenta17b14eb92f6c21a9cea97ed0ca30df74da9fc29
Merge changes from topic 'layer-wp-race' into oc-dev
am: a17b14eb92

Change-Id: I1af51f57255024d36e9cae5c221361f36cb28da4
services/surfaceflinger/Layer.cpp
services/surfaceflinger/Layer.h
services/surfaceflinger/SurfaceFlinger.cpp
services/surfaceflinger/SurfaceFlinger.h
services/surfaceflinger/SurfaceFlinger_hwc1.cpp