tree e36d334c2c787d3479596ae4f7b39a6771caf4a8
parent 6a43904bab512cadd73aeb89d79f9aef71ea4f29
parent ca5969d6e0b0dd288bf3316ca4973de5837442fc
author Eric Sandness <sandness@google.com> 1536311241 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1536311241 +0000

Merge "Block Policies From Device Admin Targetting Q"