Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit d5dd48c5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Adds... 

[automerger skipped] Merge "Adds android.permission.REGISTER_NSD_OFFLOAD_ENGINE" into main am: a0ec1987 am: 46fdc734 am: 41c590bf am: 322cab14 am: f40d8826 -s ours

am skip reason: Merged-In I15c0196b4cbc6ac7324dcde82119b6e075333936 with SHA-1 83427673 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2696913



Change-Id: Ifa43334a19b3a01a6c03fdcdf52bc43c8ddd5424
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 210f6adf f40d8826
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