tree 7cd36e4c78641b0c4157df0a06255ae2a4192e6c
parent 357fd04b12f6e88ad956db1a197af0aeb1a9011c
parent b43b52a2e138b7648005ba8187947da2bd749d73
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578594772 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578594772 +0000

[automerger skipped] Merge "Fix security problem on PermissionMonitor#hasPermission" into oc-dev am: 5e0b069876 am: 81db8d8a83 am: 5b6d8d7724 -s ours am: d0715a9f07 -s ours am: c64d1c4649 -s ours am: b43b52a2e1 -s ours
am skip reason: Change-Id Iae9c273af822b18c2e6fce04848a86f8dea6410a with SHA-1 d0205a3469 is in history

Change-Id: I1e7d1dfcc789c0a5f801c880c2bbbe8bc6e781d3