tree 7eafaabf0d3e836bffcff4d47404c1f228ea71fd
parent 3557697903ccd7058d4ff45e48d756247823edc4
parent dd9d85838e5b8e378ef722c0058926774a6719fc
author Daniel Xie <dxie@google.com> 1433315325 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433315325 +0000

am dd9d8583: am 4dd7fbee: am c688aa62: am efef9855: am 4053a34a: Merge "resolve merge conflicts of 6176421 to lollipop-cts-dev." into lollipop-cts-dev automerge: 6c78c8e

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