Commit 019554f6 authored by Nick Kralevich's avatar Nick Kralevich Committed by Android Git Automerger
Browse files

am 4b69cbd6: resolved conflicts for merge of 335e0e08 to mnc-dr-dev-plus-aosp 

* commit '4b69cbd6':
  include/android/sensor: add enum for LINEAR_ACCELERATION
parents a4820004 4b69cbd6
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment