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

Commit 2d3a0ff0 authored by Dave Mankoff's avatar Dave Mankoff Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "RESTRICT AUTOMERGE ProximitySensor now supports... 

[automerger skipped] Merge "RESTRICT AUTOMERGE ProximitySensor now supports dual-sensor approach." into rvc-d1-dev am: f4ebebef am: 93c9967d am: 4c6b2ac9 -s ours am: 37af82a5 -s ours

am skip reason: subject contains skip directive

Change-Id: I16487491e9298779f04f15f5e6b6ee297e18e6fe
parents f3d89fe8 37af82a5
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