tree b3290509aeaa40e4c1e73edb88d736b240726ecd
parent c91f9c852894a57ce92eee6bffa78602060edbb4
parent dc1990138c06aaf0b8d8c528df69c47a8156aadd
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578524337 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578524337 +0000

Merge "SurfaceFlinger: migrate capabilities to surfaceflinger.rc" am: e03e9dd1aa am: 82072cf28e am: dc1990138c

Change-Id: Iba220482cfface409aa45b30f22e611d0ff65e89