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:47 +0000 (16:50 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Thu, 9 Jan 2020 16:50:47 +0000 (16:50 +0000)
am skip reason: Change-Id Iae9c273af822b18c2e6fce04848a86f8dea6410a with SHA-1 d0205a3469 is in history

Change-Id: I9b95f9715b7d15e3f430e6c46a2fd975b6b51f23


Trivial merge