tree f25822c4647ea1b7f86162d44db324dbafd9c91e
parent f9af67fd0cd80d1bc605a3216c1b90f32fcc2e0a
parent d3409a37ae4c83c2616990cfbb2e71f54292339f
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578578022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578578022 +0000

Merge "Fix security problem on PermissionMonitor#hasPermission" into oc-dev am: 5e0b069876 am: d3409a37ae

Change-Id: I5660cafce05a0e3c6edff03bd645d8df329c5d50