Commit d3f88cf2 authored by Aravind Akella's avatar Aravind Akella Committed by Android Git Automerger
Browse files

am 421d1732: Merge "resolved conflicts for merge of 4cd407f4 to lmp-mr1-dev" into lmp-mr1-dev 

* commit '421d1732':
  Fix testBatchAndFlushWithMutipleSensors to handle cases where the device supports only one continuous mode sensor.
parents f80ea18a 421d1732
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