OSDN Git Service

[automerger skipped] Merge "Fix security problem on PermissionMonitor#hasPermission...
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Thu, 9 Jan 2020 16:50:08 +0000 (16:50 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Thu, 9 Jan 2020 16:50:08 +0000 (16:50 +0000)
am skip reason: Change-Id I2da730feda4d7ebed1f158b073167bb3964b3e7d with SHA-1 9352cb24b1 is in history

Change-Id: Id83288231d705e604e5094d40d211c0c940c4dd4


Trivial merge