OSDN Git Service

Merge "surfaceflinger: fix a potential child layer leak" into oc-dev
authorChia-I Wu <olv@google.com>
Tue, 20 Jun 2017 20:28:58 +0000 (20:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Jun 2017 20:28:58 +0000 (20:28 +0000)
commit989ed5c4c1be7e82070cc42043c3cb3d64d9de14
tree69b7cc34e7572fbfe75b57a811db1d785114faa0
parente86f70b474a9007b07fe22d0731d2789a2dc2cc4
parent1b02b6329e7a2e3ed60b2209abec1f70c33c3d18
Merge "surfaceflinger: fix a potential child layer leak" into oc-dev
am: 1b02b6329e

Change-Id: Ie2bd5a6d1d37bb5b7c7b679b8c472389ff619188
services/surfaceflinger/SurfaceFlinger.cpp
services/surfaceflinger/SurfaceFlinger_hwc1.cpp