Merge changes from topic "am-48e5b26bdc3542fc8619e4c0d1a59794"
* changes: [automerger skipped] Merge "RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23" into sc-v2-dev am:19e8834210-s ours am:27ee710fd2-s ours am:4f69ed02fa-s ours [automerger skipped] RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23 am:2509b12e6f-s ours am:09d1406405-s ours am:438a418a8c-s ours
This commit is contained in:
committed by
Android (Google) Code Review
commit
77aa1c6983