tree 10e2a8bf76f52a021418a59aae7d92961cd5cac8
parent a81d409ce10bc25bd8b3e28f8ef87376d5fa2b5b
author Valerie Hau <vhau@google.com> 1578099219 -0800
committer Valerie Hau <vhau@google.com> 1578335684 -0800

Fix callback registration during merging in same-process

Bug: 147109531
Test: build, boot, libsurfaceflinger_unittest, SurfaceFlinger_test
Change-Id: I17d9ba98ba85d45b3325588e94e978747786488c