tree 4e16b1c4bcd25eb1cbb1a863f68798f9aa2a2255
parent 1d06566c8703b57f22a13cf4e8b1d3cd680975df
parent 6c78c8e8e8d704b6ba5832c7361e207657346a14
author Daniel Xie <dxie@google.com> 1433311940 +0000
committer android-build-merger <android-build-merger@google.com> 1433311940 +0000

Merge "resolve merge conflicts of 6176421 to lollipop-cts-dev." into lollipop-cts-dev
automerge: 6c78c8e

* commit '6c78c8e8e8d704b6ba5832c7361e207657346a14':
  Fix for CTS fail android.hardware.cts.SensorTest#testSensorOperations