tree 244b4acb8de3477777db35752243527861ca0942
parent be5ae9fb0797e754f6e5ca8a5a91ab867e455cb7
parent 4053a34a54864b0cc74ba79846fcb212afbbc2a7
author Daniel Xie <dxie@google.com> 1433312454 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433312454 +0000

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

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