Skip to content
Commit dc45c396 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: 70f356b9 

Change-Id: I35dc414f9cc196dbf110315ed925de75101ad2e8
parents 0b591a58 70f356b9
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