tree 69b7cc34e7572fbfe75b57a811db1d785114faa0
parent e787161e198a3ac698e13e93c9fcca62687bd19c
parent 4d5cc905590ecbd1f70abb3f0fc37fadbac59be8
author Chia-I Wu <olv@google.com> 1497990778 +0000
committer android-build-merger <android-build-merger@google.com> 1497990778 +0000

Merge "surfaceflinger: fix a potential child layer leak" into oc-dev am: 1b02b6329e
am: 4d5cc90559

Change-Id: Ib956b914044fee1941ef966bbf96c151bbbcf6a4