tree 77caa1ceec06930906f84745ac07485f7ab851e9
parent 6c630ac5f3023bf9b961b75dc4802cf2420c3f0f
parent cc99e0de5806d7fc72b2ed58cd21b097fd7612bd
author Michael Kwan <mkwan@google.com> 1437687093 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437687093 +0000

am cc99e0de: am 1f831156: Merge "Revert "Add android.hardware.cts.SensorTest#testBatchAndFlush to knownfailures"" into lollipop-mr1-cts-dev

* commit 'cc99e0de5806d7fc72b2ed58cd21b097fd7612bd':
  Revert "Add android.hardware.cts.SensorTest#testBatchAndFlush to knownfailures"