[automerger skipped] Merge "RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23" into sc-dev am: 18db5856cc am: 15ff346130 -s ours am: fa245b1ef3 -s ours am: 08daf34256 -s ours am: 200d029332 -s ours am: 23e0cefe9f -s ours am: f956e3fbb9 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20105848 Change-Id: I65dd476445c652425cc91147d82b0f0a9ee45f0f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: