Skip to content
Commit 86e49f22 authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

Merge "AOD: When prox covered disable touch during pulse instead of aborting" into oc-dr1-dev 

am: 3cace2a1

Change-Id: Ia30c3884751a44392efb843a2da41a0528162fa2
parents b10ffae3 3cace2a1
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