OSDN Git Service

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

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