Commit 4053a34a authored by Daniel Xie's avatar Daniel Xie Committed by android-build-merger
Browse files

Merge "resolve merge conflicts of 61764212 to lollipop-cts-dev." into lollipop-cts-dev 

automerge: 6c78c8e8

* commit '6c78c8e8':
  Fix for CTS fail android.hardware.cts.SensorTest#testSensorOperations
parents 1d06566c 6c78c8e8
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