Skip to content
Commit e66367ef authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Add kotlin-annotations to PermissionController" am: f3c454f9 am: 79b64643 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Permission/+/2032267



Change-Id: I42aba73107ff45d9e3eaf6042c8cf09e98f3ec7f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2d187286 79b64643
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment