summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-09 17:41:35 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-09 17:41:35 +0000
commitb43b52a2e138b7648005ba8187947da2bd749d73 (patch)
tree50be63a92875b021fd1a9967cef76c220e3043d8
parentfd5aea2b96b59fb2805aee05d4a7be36f3c6b005 (diff)
parentc64d1c4649626941682596d11f91a8f2b08fa9e8 (diff)
downloadbase-b43b52a2e138b7648005ba8187947da2bd749d73.tar.gz
[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 skip reason: Change-Id Iae9c273af822b18c2e6fce04848a86f8dea6410a with SHA-1 d0205a3469 is in history Change-Id: Id7d778048e411acc447b4adf43d977e8eb98a8af
0 files changed, 0 insertions, 0 deletions