tree 173cf2c9b45a79816f8ffee5f92ce25f53a7114a
parent 6f920ca63bd4785c8a844c56ab5fcc275423da6e
parent 6d6cfa493a0d91ad5c73853aa219a355af6fbded
author Ady Abraham <adyabr@google.com> 1573863419 -0800
committer android-build-merger <android-build-merger@google.com> 1573863419 -0800

[automerger skipped] SurfaceFlinger: lock mStateLock when modifying allowed configs am: abf9106001
am: 6d6cfa493a -s ours
am skip reason: change_id I569e75968aea676c96fbc648140ac49a165ffb69 with SHA1 a3129fbfc3 is in history

Change-Id: I7ab57783a4c9d37ca7adf8230b79de4b7616f06a