tree a8236137a3844222041bf55e5acda5cb539fbaf8
parent 71dfea44f3eaa2725d242bb4ba317afe53313d56
parent f0b712654ab321c86f92db54b49b9a6754d09a3f
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578523253 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578523253 +0000

Merge "SurfaceFlinger: migrate capabilities to surfaceflinger.rc" am: 1f3e40e8e7 am: f0b712654a

Change-Id: I278da0f396b3e422e9b859fca52a50c2550d4e76