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

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

Merge changes from topic "am-4d16946683654151aaf688b69a96221d" 

* changes:
  Merge changes from topic "permTree-sc-dev" into sc-qpr1-dev am: 45647e1d am: de697d13 am: 4b8a858c am: 71a92c38
  [automerger skipped] [automerge] RESTRICT AUTOMERGE Validate permission tree size on permission update 2p: 1d86c8b2 am: 23e6363b -s ours am: 9470eda2 -s ours am: 96625ecb -s ours am: f6d77451 -s ours
parents b56330fc 13130976
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