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

Merge "Use alternative prox sensor when specified." into rvc-dev am: 9cfce017 am: d00ed73d 

Change-Id: I5e70099b5673c459912ef6f21f9513ca2c5a6212
parents fbab1c79 d00ed73d
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment