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

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

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

Change-Id: If3411301c8df456e1a4a4fdd9b57195e27feca6f
parents 70491521 fbab1c79
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