commit 8c612b1334d08ac14324da6e353af433af995fd6
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 05 09:02:31 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 05 09:02:31 2019 +0000
tree e43e4fc7e84f60986229bcf800676f141241738e
parent 6dbb3108a75547c7e405e7077fcbc5a9142d2ae9
parent bfe5b37bc8c5364358d349412d898a984a2e7db4

Merge changes from topic "security_fix_settings" into oc-dev

* changes:
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631 skipped: ceb1ed0a09
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e
  Do not allow draw on top for App notification settings