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

Skip to content
Commit 8d4f5079 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

[automerger skipped] Merge "Don't inherit userspace_reboot.mk from... 

[automerger skipped] Merge "Don't inherit userspace_reboot.mk from mainline_system.mk" am: c3d679bb am: 46fe30f8 am: c1a02678 -s ours
am skip reason: Change-Id If910e2a6baf8acaafc8bafdf8193ba7237f66f1a with SHA-1 0f38beca is in history

Change-Id: Idbc16082b7321bb8231baefd8147ac4e61763efe
parents e6c66dc4 c1a02678
Hide 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