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

Commit 0bcb4875 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by android-build-merger
Browse files

[automerger skipped] Merge "Add a factoryReset method to IIpMemoryStore, and... 

[automerger skipped] Merge "Add a factoryReset method to IIpMemoryStore, and freeze api." into qt-dev am: 39af0412 am: 46838701 -s ours
am: 8bdf9217 -s ours
am skip reason: change_id Ia11ecd33f528d01667b1baeb8671b7213a31eef5 with SHA1 91dd0631 is in history

Change-Id: I12fee95be578586d3e0f1810f629827d57cc5c36
parents d059240c 8bdf9217
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