Skip to content
Commit fbab1c79 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: I0eff13ed784b92d5d86cbc76e9b42bef2ee24a5f
parents 219752e3 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