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:31 +0000 (01:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 17 Jun 2017 01:58:31 +0000 (01:58 +0000)
commitf39c08c9064fff562d4473523bea7d9a12805073
tree1e606b795d9096b21705f2c5d41a28919cad1ae8
parent84051d9c974c8ea320799f267fd006ded917ef81
parenta17b14eb92f6c21a9cea97ed0ca30df74da9fc29
Merge changes from topic 'layer-wp-race' into oc-dev
am: a17b14eb92

Change-Id: I2fb898abae8b4602aa7257b45293f582f0641f24
services/surfaceflinger/Layer.cpp