summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-09 17:40:58 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-09 17:40:58 +0000
commitfd5aea2b96b59fb2805aee05d4a7be36f3c6b005 (patch)
tree50be63a92875b021fd1a9967cef76c220e3043d8
parentf3be812561de9ff4f5dafbbb978572e84843f117 (diff)
parent92b897e4a86a514360de724486dd64cb722694a4 (diff)
downloadbase-fd5aea2b96b59fb2805aee05d4a7be36f3c6b005.tar.gz
[automerger skipped] Merge "Fix security problem on PermissionMonitor#hasPermission" into pi-dev am: 361f1e97f6 -s ours am: 92b897e4a8 -s ours
am skip reason: Change-Id I2da730feda4d7ebed1f158b073167bb3964b3e7d with SHA-1 9352cb24b1 is in history Change-Id: I641d8967ec8af4b58696bf2c044f5a87a6836937
0 files changed, 0 insertions, 0 deletions