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

Commit 8ad7f434 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-ad7da298f87a4048ba11ff3d9dcdc84e" into udc-d1-dev-plus-aosp 

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into tm-qpr-dev am: 63d6d79a -s ours am: c8c490b9 -s ours am: d9dfff00 -s ours
  [automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: efc2b69c -s ours am: 893b9261 -s ours am: 76d8e035 -s ours
parents 56af90e4 f0acb261
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment