tree 741eee0512f359d7f22401b211d38ca299df52d1
parent fe7334027b0d0e85f6dbe8ab7edc76d774b6e48b
parent 8724749abf49cd2766bbd4dcad5b348d0c458ff3
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1581447619 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1581447619 +0000

[automerger skipped] DO NOT MERGE: SF: fix SurfaceFlinger freeze am: 3ca95a0e08 am: 8724749abf -s ours
am skip reason: subject contains skip directive

Change-Id: I37fc3c0e5d9856e598a4194e3afb2e18588523fc