tree 4e7f80af98907c35308391189d434d0b493499a5
parent 539d94e091f1a5dea25e81ce8d6b999d6cff2b19
parent 2afcc54b092a420471291017e53158449059778d
author TreeHugger Robot <treehugger-gerrit@google.com> 1636507887 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1636507887 +0000

[automerger skipped] Merge "Only allow trusted overlays to specify FLAG_SLIPPERY" into sc-dev am: 94fb6eff68 am: 2afcc54b09 -s ours

am skip reason: Merged-In Ia30f1c38d5ddb351c90b748ea76448a76a9dde7b with SHA-1 5972dfb715 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15748730

Change-Id: Ibc0c74ec1c1101b432d40f0b6c942c61e6a8b4e8