[automerger skipped] RESTRICT AUTOMERGE Use Alternative Prox Sensor for Falsing am: cb45d588e1 am: 2e8a666e6c -s ours
am skip reason: subject contains skip directive Change-Id: Ibabd0bbff4c19959b24bcb9727ac221c47fe2a9d
This commit is contained in: