tree 01b1c32b8c12cc06d407efc116ca6240b7b11205
parent 8167d8feb0760d809c6d419ffc09d76ebd6a9583
parent ba8be2ffd90af05cbc882a52e54db6a7bf5acc7c
author destradaa <destradaa@google.com> 1412127729 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412127729 +0000

am ba8be2ff: Merge "Update Sensor tests so they can always pass." into lmp-dev

* commit 'ba8be2ffd90af05cbc882a52e54db6a7bf5acc7c':
  Update Sensor tests so they can always pass.