[automerger skipped] Only allow trusted overlays to specify FLAG_SLIPPERY am: 07e7aaff29 am: c7052c9c79 -s ours am: bb535c95d2 -s ours am: 734bde2baa -s ours am: b05d2a6347 -s ours
am skip reason: Merged-In Ia30f1c38d5ddb351c90b748ea76448a76a9dde7b with SHA-1 07e7aaff29 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16241253
Change-Id: I605f5b3eb4cb75284919f0d1c290f299cf9d581a
This commit is contained in:
committed by
Automerger Merge Worker
commit
20c4828bb7